auth/financial-web-server
auth
/
financial-web-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 管理端预算分类完成

This commit is contained in:
Bunny 2024-11-13 17:28:05 +08:00
parent 6d5abf54db
commit 25c1f5095d
50 changed files with 179 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java
View File

@ -7,7 +7,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalAddDto;
import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto;
import cn.bunny.dao.dto.financial.savingGoal.SavingGoalUpdateDto;
import cn.bunny.dao.entity.financial.SavingGoal;
import cn.bunny.dao.vo.financial.SavingGoalVo;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.google.common.base.CaseFormat;
import io.swagger.v3.oas.annotations.media.Schema;

6
dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java
View File

@ -9,10 +9,10 @@ import lombok.EqualsAndHashCode;
@Schema(name = "BaseVo", title = "基础返回对象内容包含用户信息", description = "基础返回对象内容包含用户信息")
public class BaseUserVo extends BaseVo {
@Schema(name = "username", title = "用户名")
@Schema(name = "createUsername", title = "创建用户名")
private String createUsername;
@Schema(name = "nickname", title = "昵称")
@Schema(name = "updateUsername", title = "更新用户名")
private String updateUsername;
}

10
dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java
View File

@ -1,6 +1,7 @@
package cn.bunny.dao.dto.financial.budgetCategory;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
@ -42,12 +43,15 @@ public class BudgetCategoryAddDto {
@Schema(name = "amount", title = "预算金额")
@NotNull(message = "预算金额不能为空")
@Min(value = 0L, message = "不能低于0")
private BigDecimal amount;
@Schema(name = "period", title = "预算周期")
@NotNull(message = "预算周期不能为空")
private String startPeriod;
@Schema(name = "period", title = "预算周期")
@NotNull(message = "预算周期不能为空")
@NotBlank(message = "预算周期不能为空")
private String period;
private String endPeriod;
}

8
dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java
View File

@ -15,9 +15,6 @@ import java.math.BigDecimal;
@Schema(name = "BudgetCategoryDto对象", title = "预算分类查询", description = "预算分类查询")
public class BudgetCategoryDto {
@Schema(name = "parentId", title = "父级id")
private Long parentId;
@Schema(name = "userId", title = "绑定的用户id")
private Long userId;
@ -34,7 +31,10 @@ public class BudgetCategoryDto {
private BigDecimal amount;
@Schema(name = "period", title = "预算周期")
private String period;
private String startPeriod;
@Schema(name = "period", title = "预算周期")
private String endPeriod;
}

7
dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java
View File

@ -50,8 +50,11 @@ public class BudgetCategoryUpdateDto {
@Schema(name = "period", title = "预算周期")
@NotNull(message = "预算周期不能为空")
@NotBlank(message = "预算周期不能为空")
private String period;
private String startPeriod;
@Schema(name = "period", title = "预算周期")
@NotNull(message = "预算周期不能为空")
private String endPeriod;
}

4
dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java
View File

@ -18,10 +18,6 @@ import java.time.LocalDateTime;
@Schema(name = "CategoryUserAddDto对象", title = "债务还款计划表添加", description = "债务还款计划表添加")
public class DebtRepaymentPlanAddDto {
@Schema(name = "debtId", title = "债务ID")
@NotNull(message = "债务不能为空")
private Long debtId;
@Schema(name = "installmentNumber", title = "债务金额")
@NotNull(message = "债务金额不能为空")
private BigDecimal installmentNumber;

3
dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java
View File

@ -16,9 +16,6 @@ import java.time.LocalDateTime;
@Schema(name = "DebtRepaymentPlanDto对象", title = "债务还款计划查询", description = "债务还款计划查询")
public class DebtRepaymentPlanDto {
@Schema(name = "debtId", title = "债务ID")
private Long debtId;
@Schema(name = "installmentNumber", title = "债务金额")
private BigDecimal installmentNumber;

4
dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java
View File

@ -22,10 +22,6 @@ public class DebtRepaymentPlanUpdateDto {
@NotNull(message = "id不能为空")
private Long id;
@Schema(name = "debtId", title = "债务ID")
@NotNull(message = "债务不能为空")
private Long debtId;
@Schema(name = "installmentNumber", title = "债务金额")
@NotNull(message = "债务金额不能为空")
private BigDecimal installmentNumber;

7
dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java
View File

@ -42,7 +42,10 @@ public class BudgetCategory extends BaseEntity {
@Schema(name = "amount", title = "预算金额")
private BigDecimal amount;
@Schema(name = "period", title = "预算周期")
private String period;
@Schema(name = "startPeriod", title = "开始预算周期")
private String startPeriod;
@Schema(name = "endPeriod", title = "结束预算周期")
private String endPeriod;
}

20
dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java
View File

@ -1,19 +1,14 @@
package cn.bunny.dao.entity.financial;
import cn.bunny.dao.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.experimental.Accessors;
/**
* <p>
@ -28,10 +23,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@TableName("t_debt_repayment_plan")
@Schema(name = "DebtRepaymentPlan对象", title = "债务还款计划表", description = "债务还款计划表")
public class DebtRepaymentPlan extends BaseEntity {
@Schema(name = "debtId", title = "债务ID")
private Long debtId;
public class DebtRepaymentPlan extends BaseEntity {
@Schema(name = "installmentNumber", title = "债务金额")
private BigDecimal installmentNumber;

33
dao/src/main/java/cn/bunny/dao/vo/financial/DebtCollectionManagementVo.java
View File

@ -1,33 +0,0 @@
package cn.bunny.dao.vo.financial;
import cn.bunny.dao.common.vo.BaseVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Schema(name = "DebtCollectionManagementVo对象", title = "债务回收管理返回内容", description = "债务回收管理返回内容")
public class DebtCollectionManagementVo extends BaseVo {
@Schema(name = "debtId", title = "债务ID")
private Long debtId;
@Schema(name = "recoveryDate", title = "回收日期")
private LocalDateTime recoveryDate;
@Schema(name = "recoveryAmount", title = "回收金额")
private BigDecimal recoveryAmount;
@Schema(name = "recoveryMethod", title = "回收方式")
private String recoveryMethod;
@Schema(name = "notes", title = "备注")
private String notes;
}

35
dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryParentVo.java Normal file
View File

@ -0,0 +1,35 @@
package cn.bunny.dao.vo.financial.admin;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Schema(name = "BudgetCategoryParentVo对象", title = "预算分类父级返回对象", description = "预算分类父级返回对象")
public class BudgetCategoryParentVo {
@Schema(name = "id", title = "主键")
@JsonProperty("id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private Long id;
@Schema(name = "parentId", title = "父级id")
private Long parentId;
@Schema(name = "categoryName", title = "分类名称")
private String categoryName;
@Schema(name = "budgetName", title = "预算名称")
private String budgetName;
}

21
dao/src/main/java/cn/bunny/dao/vo/financial/BudgetCategoryVo.java → dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java
View File

@ -1,6 +1,9 @@
package cn.bunny.dao.vo.financial;
package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseVo;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@ -12,14 +15,21 @@ import java.math.BigDecimal;
@NoArgsConstructor
@Builder
@Schema(name = "BudgetCategoryVo对象", title = "预算分类查询返回对象", description = "预算分类查询返回对象")
public class BudgetCategoryVo extends BaseVo {
public class BudgetCategoryVo extends BaseUserVo {
@Schema(name = "parentId", title = "父级id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private Long parentId;
@Schema(name = "userId", title = "绑定的用户id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private Long userId;
@Schema(name = "username", title = "用户名")
private String username;
@Schema(name = "categoryName", title = "分类名称")
private String categoryName;
@ -33,6 +43,9 @@ public class BudgetCategoryVo extends BaseVo {
private BigDecimal amount;
@Schema(name = "period", title = "预算周期")
private String period;
private String startPeriod;
@Schema(name = "period", title = "预算周期")
private String endPeriod;
}

2
dao/src/main/java/cn/bunny/dao/vo/configuration/CategoryVo.java → dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.configuration;
package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;

5
dao/src/main/java/cn/bunny/dao/vo/financial/DebtRepaymentPlanVo.java → dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.financial;
package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseVo;
import io.swagger.v3.oas.annotations.media.Schema;
@ -15,9 +15,6 @@ import java.time.LocalDateTime;
@Schema(name = "DebtRepaymentPlanVo对象", title = "债务还款计划返回对象", description = "债务还款计划返回对象")
public class DebtRepaymentPlanVo extends BaseVo {
@Schema(name = "debtId", title = "债务ID")
private Long debtId;
@Schema(name = "installmentNumber", title = "债务金额")
private BigDecimal installmentNumber;

2
dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java → dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.financial;
package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseVo;
import io.swagger.v3.oas.annotations.media.Schema;

2
dao/src/main/java/cn/bunny/dao/vo/financial/SavingGoalVo.java → dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.financial;
package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseVo;
import io.swagger.v3.oas.annotations.media.Schema;

4
dao/src/main/java/cn/bunny/dao/vo/financial/BillVo.java → dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.financial;
package cn.bunny.dao.vo.financial.user;
import cn.bunny.dao.common.vo.BaseVo;
import com.alibaba.fastjson2.annotation.JSONField;
@ -20,7 +20,7 @@ import java.time.LocalDateTime;
@NoArgsConstructor
@Builder
@Schema(name = "BillVo对象", title = "账单信息返回内容", description = "账单信息返回内容")
public class BillVo extends BaseVo {
public class BillUserVo extends BaseVo {
@Schema(name = "username", title = "类型：1 - 收入，-1 - 支出")
private Byte type;

2
dao/src/main/java/cn/bunny/dao/vo/financial/CategoryUserVo.java → dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.financial;
package cn.bunny.dao.vo.financial.user;
import cn.bunny.dao.common.vo.BaseVo;
import io.swagger.v3.oas.annotations.media.Schema;

2
service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java
View File

@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.DebtRepaymentPlan;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo;
import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo;
import cn.bunny.services.service.financial.DebtRepaymentPlanService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;

16
service/src/main/java/cn/bunny/services/controller/financial/BillUserController.java → service/src/main/java/cn/bunny/services/controller/financial/BillController.java
View File

@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.Bill;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.financial.BillVo;
import cn.bunny.dao.vo.financial.user.BillUserVo;
import cn.bunny.services.service.financial.BillService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
@ -31,40 +31,40 @@ import java.util.List;
@Tag(name = "账单信息", description = "账单信息相关接口")
@RestController
@RequestMapping("admin/bill")
public class BillUserController {
public class BillController {
@Autowired
private BillService billService;
@Operation(summary = "分页查询账单信息", description = "分页查询账单信息")
@GetMapping("noManage/getBillList/{page}/{limit}")
public Mono<Result<PageResult<BillVo>>> getBillList(
@GetMapping("noManage/getUserBillList/{page}/{limit}")
public Mono<Result<PageResult<BillUserVo>>> getBillList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@PathVariable("limit") Integer limit,
BillUserDto dto) {
Page<Bill> pageParams = new Page<>(page, limit);
PageResult<BillVo> pageResult = billService.getBillList(pageParams, dto);
PageResult<BillUserVo> pageResult = billService.getBillList(pageParams, dto);
return Mono.just(Result.success(pageResult));
}
@Operation(summary = "添加账单信息", description = "添加账单信息")
@PostMapping("noManage/addBill")
@PostMapping("noManage/addUserBill")
public Mono<Result<String>> addBill(@Valid @RequestBody BillUserAddDto dto) {
billService.addBill(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
}
@Operation(summary = "更新账单信息", description = "更新账单信息")
@PutMapping("noManage/updateBill")
@PutMapping("noManage/updateUserBill")
public Mono<Result<String>> updateBill(@Valid @RequestBody BillUserUpdateDto dto) {
billService.updateBill(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
}
@Operation(summary = "删除账单信息", description = "删除账单信息")
@DeleteMapping("noManage/deleteBill")
@DeleteMapping("noManage/deleteUserBill")
public Mono<Result<String>> deleteBill(@RequestBody List<Long> ids) {
billService.deleteBill(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));

10
service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java
View File

@ -7,7 +7,8 @@ import cn.bunny.dao.entity.financial.BudgetCategory;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.financial.BudgetCategoryVo;
import cn.bunny.dao.vo.financial.admin.BudgetCategoryParentVo;
import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo;
import cn.bunny.services.service.financial.BudgetCategoryService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
@ -49,6 +50,13 @@ public class BudgetCategoryController {
return Mono.just(Result.success(pageResult));
}
@Operation(summary = "返回所有父级对象", description = "返回所有父级对象")
@GetMapping("noManage/getAllParentList")
public Mono<Result<List<BudgetCategoryParentVo>>> getAllParentList() {
List<BudgetCategoryParentVo> voList = budgetCategoryService.getAllParentList();
return Mono.just(Result.success(voList));
}
@Operation(summary = "添加预算分类表", description = "添加预算分类表")
@PostMapping("addBudgetCategory")
public Mono<Result<String>> addBudgetCategory(@Valid @RequestBody BudgetCategoryAddDto dto) {

4
service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java
View File

@ -10,8 +10,8 @@ import cn.bunny.dao.entity.financial.Category;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.configuration.CategoryVo;
import cn.bunny.dao.vo.financial.CategoryUserVo;
import cn.bunny.dao.vo.financial.admin.CategoryVo;
import cn.bunny.dao.vo.financial.user.CategoryUserVo;
import cn.bunny.services.service.financial.CategoryService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;

2
service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java
View File

@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.DebtTracking;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.financial.DebtTrackingVo;
import cn.bunny.dao.vo.financial.admin.DebtTrackingVo;
import cn.bunny.services.service.financial.DebtTrackingService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;

2
service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java
View File

@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.SavingGoal;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.financial.SavingGoalVo;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
import cn.bunny.services.service.financial.SavingGoalService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;

4
service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java
View File

@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial;
import cn.bunny.dao.dto.financial.bill.user.BillUserDto;
import cn.bunny.dao.entity.financial.Bill;
import cn.bunny.dao.vo.financial.BillVo;
import cn.bunny.dao.vo.financial.user.BillUserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -29,7 +29,7 @@ public interface BillMapper extends BaseMapper<Bill> {
* @param dto 账单信息查询表单
* @return 账单信息分页结果
*/
IPage<BillVo> selectListByPage(@Param("page") Page<Bill> pageParams, @Param("dto") BillUserDto dto, @Param("userId") Long userId);
IPage<BillUserVo> selectListByPage(@Param("page") Page<Bill> pageParams, @Param("dto") BillUserDto dto, @Param("userId") Long userId);
/**
* 物理删除账单信息

2
service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java
View File

@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial;
import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto;
import cn.bunny.dao.entity.financial.BudgetCategory;
import cn.bunny.dao.vo.financial.BudgetCategoryVo;
import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

4
service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java
View File

@ -3,8 +3,8 @@ package cn.bunny.services.mapper.financial;
import cn.bunny.dao.dto.financial.category.admin.CategoryDto;
import cn.bunny.dao.dto.financial.category.user.CategoryUserDto;
import cn.bunny.dao.entity.financial.Category;
import cn.bunny.dao.vo.configuration.CategoryVo;
import cn.bunny.dao.vo.financial.CategoryUserVo;
import cn.bunny.dao.vo.financial.admin.CategoryVo;
import cn.bunny.dao.vo.financial.user.CategoryUserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java
View File

@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial;
import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto;
import cn.bunny.dao.entity.financial.DebtRepaymentPlan;
import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo;
import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java
View File

@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial;
import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingDto;
import cn.bunny.dao.entity.financial.DebtTracking;
import cn.bunny.dao.vo.financial.DebtTrackingVo;
import cn.bunny.dao.vo.financial.admin.DebtTrackingVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java
View File

@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial;
import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto;
import cn.bunny.dao.entity.financial.SavingGoal;
import cn.bunny.dao.vo.financial.SavingGoalVo;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

4
service/src/main/java/cn/bunny/services/service/financial/BillService.java
View File

@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.bill.user.BillUserDto;
import cn.bunny.dao.dto.financial.bill.user.BillUserUpdateDto;
import cn.bunny.dao.entity.financial.Bill;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.BillVo;
import cn.bunny.dao.vo.financial.user.BillUserVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
@ -27,7 +27,7 @@ public interface BillService extends IService<Bill> {
*
* @return 账单信息返回列表
*/
PageResult<BillVo> getBillList(Page<Bill> pageParams, BillUserDto dto);
PageResult<BillUserVo> getBillList(Page<Bill> pageParams, BillUserDto dto);
/**
* * 添加账单信息

10
service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java
View File

@ -5,7 +5,8 @@ import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto;
import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryUpdateDto;
import cn.bunny.dao.entity.financial.BudgetCategory;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.BudgetCategoryVo;
import cn.bunny.dao.vo.financial.admin.BudgetCategoryParentVo;
import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
@ -49,4 +50,11 @@ public interface BudgetCategoryService extends IService<BudgetCategory> {
* @param ids 删除id列表
*/
void deleteBudgetCategory(List<Long> ids);
/**
* 返回所有父级对象
*
* @return 父级列表
*/
List<BudgetCategoryParentVo> getAllParentList();
}

4
service/src/main/java/cn/bunny/services/service/financial/CategoryService.java
View File

@ -8,8 +8,8 @@ import cn.bunny.dao.dto.financial.category.user.CategoryUserDto;
import cn.bunny.dao.dto.financial.category.user.CategoryUserUpdateDto;
import cn.bunny.dao.entity.financial.Category;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.configuration.CategoryVo;
import cn.bunny.dao.vo.financial.CategoryUserVo;
import cn.bunny.dao.vo.financial.admin.CategoryVo;
import cn.bunny.dao.vo.financial.user.CategoryUserVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;

2
service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java
View File

@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto;
import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanUpdateDto;
import cn.bunny.dao.entity.financial.DebtRepaymentPlan;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo;
import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;

2
service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java
View File

@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingDto;
import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingUpdateDto;
import cn.bunny.dao.entity.financial.DebtTracking;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.DebtTrackingVo;
import cn.bunny.dao.vo.financial.admin.DebtTrackingVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;

2
service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java
View File

@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto;
import cn.bunny.dao.dto.financial.savingGoal.SavingGoalUpdateDto;
import cn.bunny.dao.entity.financial.SavingGoal;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.SavingGoalVo;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;

8
service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java
View File

@ -6,7 +6,7 @@ import cn.bunny.dao.dto.financial.bill.user.BillUserDto;
import cn.bunny.dao.dto.financial.bill.user.BillUserUpdateDto;
import cn.bunny.dao.entity.financial.Bill;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.BillVo;
import cn.bunny.dao.vo.financial.user.BillUserVo;
import cn.bunny.services.mapper.financial.BillMapper;
import cn.bunny.services.service.financial.BillService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -37,14 +37,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
* @return 查询分页账单信息返回对象
*/
@Override
public PageResult<BillVo> getBillList(Page<Bill> pageParams, BillUserDto dto) {
public PageResult<BillUserVo> getBillList(Page<Bill> pageParams, BillUserDto dto) {
// 需要根据当前用户去查询
Long userId = BaseContext.getUserId();
// 判断创建用户的Id是否和当前请求的用户id是否相同
IPage<BillVo> page = baseMapper.selectListByPage(pageParams, dto, userId);
IPage<BillUserVo> page = baseMapper.selectListByPage(pageParams, dto, userId);
return PageResult.<BillVo>builder()
return PageResult.<BillUserVo>builder()
.list(page.getRecords())
.pageNo(page.getCurrent())
.pageSize(page.getSize())

17
service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java
View File

@ -5,7 +5,8 @@ import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto;
import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryUpdateDto;
import cn.bunny.dao.entity.financial.BudgetCategory;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.BudgetCategoryVo;
import cn.bunny.dao.vo.financial.admin.BudgetCategoryParentVo;
import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo;
import cn.bunny.services.mapper.financial.BudgetCategoryMapper;
import cn.bunny.services.service.financial.BudgetCategoryService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -82,4 +83,18 @@ public class BudgetCategoryServiceImpl extends ServiceImpl<BudgetCategoryMapper,
public void deleteBudgetCategory(List<Long> ids) {
baseMapper.deleteBatchIdsWithPhysics(ids);
}
/**
* 返回所有父级对象
*
* @return 父级列表
*/
@Override
public List<BudgetCategoryParentVo> getAllParentList() {
return list().stream().map(budgetCategory -> {
BudgetCategoryParentVo budgetCategoryParentVo = new BudgetCategoryParentVo();
BeanUtils.copyProperties(budgetCategory, budgetCategoryParentVo);
return budgetCategoryParentVo;
}).toList();
}
}

4
service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java
View File

@ -12,8 +12,8 @@ import cn.bunny.dao.entity.financial.Category;
import cn.bunny.dao.pojo.constant.UserConstant;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.configuration.CategoryVo;
import cn.bunny.dao.vo.financial.CategoryUserVo;
import cn.bunny.dao.vo.financial.admin.CategoryVo;
import cn.bunny.dao.vo.financial.user.CategoryUserVo;
import cn.bunny.services.mapper.financial.CategoryMapper;
import cn.bunny.services.service.financial.CategoryService;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java
View File

@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto;
import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanUpdateDto;
import cn.bunny.dao.entity.financial.DebtRepaymentPlan;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo;
import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo;
import cn.bunny.services.mapper.financial.DebtRepaymentPlanMapper;
import cn.bunny.services.service.financial.DebtRepaymentPlanService;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java
View File

@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingDto;
import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingUpdateDto;
import cn.bunny.dao.entity.financial.DebtTracking;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.DebtTrackingVo;
import cn.bunny.dao.vo.financial.admin.DebtTrackingVo;
import cn.bunny.services.mapper.financial.DebtTrackingMapper;
import cn.bunny.services.service.financial.DebtTrackingService;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java
View File

@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto;
import cn.bunny.dao.dto.financial.savingGoal.SavingGoalUpdateDto;
import cn.bunny.dao.entity.financial.SavingGoal;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.SavingGoalVo;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
import cn.bunny.services.mapper.financial.SavingGoalMapper;
import cn.bunny.services.service.financial.SavingGoalService;
import com.baomidou.mybatisplus.core.metadata.IPage;

19
service/src/main/resources/application-dev.yml
View File

@ -36,25 +36,6 @@ bunny:
accessKey: bunny
secretKey: "02120212"
bucket-name: financial
#bunny:
# master:
# host: rm-bp12z6hlv46vi6g8mro.mysql.rds.aliyuncs.com
# port: 3306
# database: family_financial
# username: family_financial_prod
# password: 0212family_financial
#
# redis:
# host: 47.120.65.66
# port: 6379
# database: 6
# password: "02120212"
#
# minio:
# endpointUrl: "http://116.196.101.14:9000"
# accessKey: bunny
# secretKey: "02120212"
# bucket-name: financial
backPath: "D:\\MyData\\backup"
bashPath: "D:\\MyData"

2
service/src/main/resources/mapper/financial/BillMapper.xml
View File

@ -23,7 +23,7 @@
</sql>
<!-- 分页查询账单信息内容 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.BillVo">
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.user.BillUserVo">
select
base.*,
category.category_name,

21
service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml
View File

@ -16,30 +16,30 @@
<id column="budget_name" property="budgetName"/>
<id column="status_type" property="statusType"/>
<id column="amount" property="amount"/>
<id column="period" property="period"/>
<id column="start_period" property="startPeriod"/>
<id column="end_period" property="endPeriod"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, create_time, update_time, create_user, update_user, is_deleted, parent_id, user_id, category_name, budget_name, status_type, amount, period
id, create_time, update_time, create_user, update_user, is_deleted, parent_id, user_id, category_name, budget_name, status_type, amount, start_period, end_period
</sql>
<!-- 分页查询预算分类表内容 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.BudgetCategoryVo">
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.admin.BudgetCategoryVo">
select
base.*,
base_user.username as username,
create_user.username as create_username,
update_user.username as update_username
from t_budget_category base
left join sys_user base_user on base_user.id = base.user_id
left join sys_user create_user on create_user.id = base.create_user
left join sys_user update_user on update_user.id = base.update_user
<where>
base.is_deleted = 0
<if test="dto.parentId != null and dto.parentId != ''">
and base.parent_id like CONCAT('%',#{dto.parentId},'%')
</if>
<if test="dto.userId != null and dto.userId != ''">
and base.user_id like CONCAT('%',#{dto.userId},'%')
and base.user_id = #{dto.userId}
</if>
<if test="dto.categoryName != null and dto.categoryName != ''">
and base.category_name like CONCAT('%',#{dto.categoryName},'%')
@ -48,13 +48,14 @@
and base.budget_name like CONCAT('%',#{dto.budgetName},'%')
</if>
<if test="dto.statusType != null and dto.statusType != ''">
and base.status_type like CONCAT('%',#{dto.statusType},'%')
and base.status_type = #{dto.statusType}
</if>
<if test="dto.amount != null and dto.amount != ''">
and base.amount like CONCAT('%',#{dto.amount},'%')
</if>
<if test="dto.period != null and dto.period != ''">
and base.period like CONCAT('%',#{dto.period},'%')
<if test="dto.startPeriod != null and dto.endPeriod != null">
and (base.start_period between #{dto.startPeriod} and #{dto.endPeriod})
and (base.end_period between #{dto.startPeriod} and #{dto.endPeriod})
</if>
</where>
</select>

4
service/src/main/resources/mapper/financial/CategoryMapper.xml
View File

@ -21,7 +21,7 @@
</sql>
<!-- 分页查询分类信息内容 -->
<select id="selectUserListByPage" resultType="cn.bunny.dao.vo.financial.CategoryUserVo">
<select id="selectUserListByPage" resultType="cn.bunny.dao.vo.financial.user.CategoryUserVo">
select
base.*,
create_user.username as create_username,
@ -52,7 +52,7 @@
</delete>
<!-- 分页查询分类信息内容 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.configuration.CategoryVo">
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.admin.CategoryVo">
select
base.*,
category_user.username as username,

8
service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml
View File

@ -10,7 +10,6 @@
<id column="create_user" property="createUser"/>
<id column="update_user" property="updateUser"/>
<id column="is_deleted" property="isDeleted"/>
<id column="debt_id" property="debtId"/>
<id column="installment_number" property="installmentNumber"/>
<id column="installment_amount" property="installmentAmount"/>
<id column="due_date" property="dueDate"/>
@ -20,11 +19,11 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, create_time, update_time, create_user, update_user, is_deleted, debt_id, installment_number, installment_amount, due_date, paid_amount, payment_status
id, create_time, update_time, create_user, update_user, is_deleted, installment_number, installment_amount, due_date, paid_amount, payment_status
</sql>
<!-- 分页查询债务还款计划表内容 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.DebtRepaymentPlanVo">
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo">
select
base.*,
create_user.username as create_username,
@ -34,9 +33,6 @@
left join sys_user update_user on update_user.id = base.update_user
<where>
base.is_deleted = 0
<if test="dto.debtId != null and dto.debtId != ''">
and base.debt_id like CONCAT('%',#{dto.debtId},'%')
</if>
<if test="dto.installmentNumber != null and dto.installmentNumber != ''">
and base.installment_number like CONCAT('%',#{dto.installmentNumber},'%')
</if>

2
service/src/main/resources/mapper/financial/DebtTrackingMapper.xml
View File

@ -24,7 +24,7 @@
</sql>
<!-- 分页查询债务追踪内容 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.DebtTrackingVo">
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.admin.DebtTrackingVo">
select
base.*,
create_user.username as create_username,

2
service/src/main/resources/mapper/financial/SavingGoalMapper.xml
View File

@ -23,7 +23,7 @@
</sql>
<!-- 分页查询用户储值内容 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.SavingGoalVo">
<select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.admin.SavingGoalVo">
select
base.*,
create_user.username as create_username,