From c30ceeb719478a8e155233324171649b21f57318 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Mon, 11 Nov 2024 16:42:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=80=BA=E5=8A=A1=E8=BF=BD=E8=B8=AA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/generator/WebGeneratorCode.java | 20 +++--- .../debtTracking/DebtTrackingAddDto.java | 49 +++++++++++++ .../debtTracking/DebtTrackingDto.java | 38 ++++++++++ .../debtTracking/DebtTrackingUpdateDto.java | 52 ++++++++++++++ .../dao/entity/financial/DebtTracking.java | 32 +++++---- .../dao/vo/financial/DebtTrackingVo.java | 36 ++++++++++ .../financial/DebtTrackingController.java | 62 +++++++++++++++-- .../mapper/financial/DebtTrackingMapper.java | 26 ++++++- .../financial/DebtTrackingService.java | 40 ++++++++++- .../impl/DebtTrackingServiceImpl.java | 69 ++++++++++++++++++- .../mapper/financial/DebtTrackingMapper.xml | 68 ++++++++++++++---- 11 files changed, 444 insertions(+), 48 deletions(-) create mode 100644 dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingAddDto.java create mode 100644 dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingDto.java create mode 100644 dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingUpdateDto.java create mode 100644 dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java index 41abd14..73e44d1 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java @@ -3,11 +3,11 @@ package cn.bunny.common.generator.generator; import cn.bunny.common.generator.entity.BaseField; import cn.bunny.common.generator.entity.BaseResultMap; import cn.bunny.common.generator.utils.GeneratorCodeUtils; -import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementAddDto; -import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementDto; -import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementUpdateDto; -import cn.bunny.dao.entity.financial.DebtCollectionManagement; -import cn.bunny.dao.vo.financial.DebtCollectionManagementVo; +import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingAddDto; +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.vo.financial.DebtTrackingVo; import com.baomidou.mybatisplus.annotation.TableName; import com.google.common.base.CaseFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -52,11 +52,11 @@ public class WebGeneratorCode { public static String resourceMapperPath = "D:\\MyFolder\\auth\\financial-web-server\\service\\src\\main\\resources\\mapper\\financial\\"; public static void main(String[] args) throws Exception { - Class> originalClass = DebtCollectionManagement.class; - Class> dtoClass = DebtCollectionManagementDto.class; - Class> addDtoClass = DebtCollectionManagementAddDto.class; - Class> updateDtoClass = DebtCollectionManagementUpdateDto.class; - Class> voClass = DebtCollectionManagementVo.class; + Class> originalClass = DebtTracking.class; + Class> dtoClass = DebtTrackingDto.class; + Class> addDtoClass = DebtTrackingAddDto.class; + Class> updateDtoClass = DebtTrackingUpdateDto.class; + Class> voClass = DebtTrackingVo.class; // 设置velocity资源加载器 Properties prop = new Properties(); diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingAddDto.java new file mode 100644 index 0000000..6d345ac --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingAddDto.java @@ -0,0 +1,49 @@ +package cn.bunny.dao.dto.financial.debtTracking; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "DebtTrackingAddDto对象", title = "债务追踪添加", description = "债务追踪") +public class DebtTrackingAddDto { + + @Schema(name = "userId", title = "绑定的用户") + @NotNull(message = "债务不能为空") + private Long userId; + + @Schema(name = "debtorName", title = "债务人姓名") + @NotNull(message = "债务人姓名不能为空") + @NotBlank(message = "债务人姓名不能为空") + private String debtorName; + + @Schema(name = "debtAmount", title = "债务金额") + @NotNull(message = "债务不能为空") + private BigDecimal debtAmount; + + @Schema(name = "debtType", title = "债务类型") + @NotNull(message = "债务类型不能为空") + @NotBlank(message = "债务类型不能为空") + private String debtType; + + @Schema(name = "debtStatus", title = "债务状态") + @NotNull(message = "债务状态不能为空") + @NotBlank(message = "债务状态不能为空") + private String debtStatus; + + @Schema(name = "dueDate", title = "还款截止日期") + @NotNull(message = "债务不能为空") + private LocalDateTime dueDate; + +} + diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingDto.java new file mode 100644 index 0000000..e901965 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingDto.java @@ -0,0 +1,38 @@ +package cn.bunny.dao.dto.financial.debtTracking; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "DebtTrackingDto对象", title = "债务追踪查询", description = "债务追踪查询") +public class DebtTrackingDto { + + @Schema(name = "userId", title = "绑定的用户") + private Long userId; + + @Schema(name = "debtorName", title = "债务人姓名") + private String debtorName; + + @Schema(name = "debtAmount", title = "债务金额") + private BigDecimal debtAmount; + + @Schema(name = "debtType", title = "债务类型") + private String debtType; + + @Schema(name = "debtStatus", title = "债务状态") + private String debtStatus; + + @Schema(name = "dueDate", title = "还款截止日期") + private LocalDateTime dueDate; + +} + diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingUpdateDto.java new file mode 100644 index 0000000..77bcc0a --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtTracking/DebtTrackingUpdateDto.java @@ -0,0 +1,52 @@ +package cn.bunny.dao.dto.financial.debtTracking; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "DebtTrackingUpdateDto对象", title = "债务追踪更新", description = "债务追踪更新") +public class DebtTrackingUpdateDto { + + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空") + private Long id; + + @Schema(name = "userId", title = "绑定的用户") + @NotNull(message = "债务不能为空") + private Long userId; + + @Schema(name = "debtorName", title = "债务人姓名") + @NotNull(message = "债务人姓名不能为空") + @NotBlank(message = "债务人姓名不能为空") + private String debtorName; + + @Schema(name = "debtAmount", title = "债务金额") + @NotNull(message = "债务不能为空") + private BigDecimal debtAmount; + + @Schema(name = "debtType", title = "债务类型") + @NotNull(message = "债务类型不能为空") + @NotBlank(message = "债务类型不能为空") + private String debtType; + + @Schema(name = "debtStatus", title = "债务状态") + @NotNull(message = "债务状态不能为空") + @NotBlank(message = "债务状态不能为空") + private String debtStatus; + + @Schema(name = "dueDate", title = "还款截止日期") + @NotNull(message = "债务不能为空") + private LocalDateTime dueDate; + +} diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtTracking.java b/dao/src/main/java/cn/bunny/dao/entity/financial/DebtTracking.java index 2d54ed5..6aad05a 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtTracking.java +++ b/dao/src/main/java/cn/bunny/dao/entity/financial/DebtTracking.java @@ -1,18 +1,15 @@ 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 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 lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** *
* 债务追踪表 @@ -25,25 +22,30 @@ import lombok.experimental.Accessors; @Setter @Accessors(chain = true) @TableName("t_debt_tracking") -@ApiModel(value = "DebtTracking对象", description = "债务追踪表") -public class DebtTracking extends BaseEntity { +@Schema(name = "DebtTracking对象", title = "债务追踪", description = "债务追踪") +public class DebtTracking extends BaseEntity { - @ApiModelProperty("绑定的用户id") + @Schema(name = "userId", title = "绑定的用户") private Long userId; - @ApiModelProperty("债务人姓名") + @Schema(name = "debtorName", title = "债务人姓名") private String debtorName; - @ApiModelProperty("债务金额") + @Schema(name = "debtAmount", title = "债务金额") private BigDecimal debtAmount; - @ApiModelProperty("债务类型,如信用卡债务、贷款债务") + @Schema(name = "debtType", title = "债务类型") private String debtType; - @ApiModelProperty("债务状态,如未还、部分还款、已还清等") + @Schema(name = "debtStatus", title = "债务状态") private String debtStatus; - @ApiModelProperty("还款截止日期") + @Schema(name = "dueDate", title = "还款截止日期") private LocalDateTime dueDate; } + + + + + diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java new file mode 100644 index 0000000..fb06f2e --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java @@ -0,0 +1,36 @@ +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 = "DebtTrackingVo对象", title = "债务追踪返回内容", description = "债务追踪返回内容") +public class DebtTrackingVo extends BaseVo { + + @Schema(name = "userId", title = "绑定的用户") + private Long userId; + + @Schema(name = "debtorName", title = "债务人姓名") + private String debtorName; + + @Schema(name = "debtAmount", title = "债务金额") + private BigDecimal debtAmount; + + @Schema(name = "debtType", title = "债务类型") + private String debtType; + + @Schema(name = "debtStatus", title = "债务状态") + private String debtStatus; + + @Schema(name = "dueDate", title = "还款截止日期") + private LocalDateTime dueDate; + +} \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java b/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java index e999aa0..c42c239 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java @@ -1,7 +1,24 @@ package cn.bunny.services.controller.financial; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingAddDto; +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.pojo.result.Result; +import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.financial.DebtTrackingVo; +import cn.bunny.services.service.financial.DebtTrackingService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import reactor.core.publisher.Mono; + +import java.util.List; /** *
@@ -9,10 +26,47 @@ import org.springframework.web.bind.annotation.RestController; *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:36:31 */ +@Tag(name = "债务追踪", description = "债务追踪相关接口") @RestController -@RequestMapping("/debtTracking") +@RequestMapping("admin/debtTracking") public class DebtTrackingController { + @Autowired + private DebtTrackingService debtTrackingService; + + @Operation(summary = "分页查询债务追踪", description = "分页查询债务追踪") + @GetMapping("getDebtTrackingList/{page}/{limit}") + public Mono- * 债务追踪表 Mapper 接口 + * 债务追踪 Mapper 接口 *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:36:31 */ @Mapper public interface DebtTrackingMapper extends BaseMapper- * 债务追踪表 服务类 + * 债务追踪 服务类 *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:36:31 */ public interface DebtTrackingService extends IService- * 债务追踪表 服务实现类 + * 债务追踪 服务实现类 *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:36:31 */ @Service public class DebtTrackingServiceImpl extends ServiceImpl