From d835d962fc731be89b2164873be8a07dfb8085c9 Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Fri, 15 Nov 2024 18:03:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=80=BA=E5=8A=A1=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E5=92=8C=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/financial/bill/admin/BillAddDto.java | 1 -
.../financial/bill/admin/BillUpdateDto.java | 8 +++-
.../budgetCategory/BudgetCategoryAddDto.java | 16 ++++---
.../budgetCategory/BudgetCategoryDto.java | 12 +++--
.../BudgetCategoryUpdateDto.java | 10 +++-
.../DebtCollectionManagementAddDto.java | 43 -----------------
.../DebtCollectionManagementDto.java | 36 --------------
.../DebtCollectionManagementUpdateDto.java | 47 -------------------
.../{admin => }/DebtRepaymentPlanAddDto.java | 6 ++-
.../{admin => }/DebtRepaymentPlanDto.java | 8 ++--
.../DebtRepaymentPlanUpdateDto.java | 6 ++-
.../debtTracking/DebtTrackingAddDto.java | 4 ++
.../debtTracking/DebtTrackingDto.java | 6 ++-
.../debtTracking/DebtTrackingUpdateDto.java | 5 +-
.../{admin => }/SavingGoalAddDto.java | 14 +++---
.../savingGoal/{admin => }/SavingGoalDto.java | 10 ++--
.../{admin => }/SavingGoalUpdateDto.java | 14 ++++--
.../dao/entity/financial/BudgetCategory.java | 9 ++--
.../dao/entity/financial/SavingGoal.java | 5 +-
.../vo/financial/admin/BudgetCategoryVo.java | 19 ++++++--
.../financial/admin/DebtRepaymentPlanVo.java | 7 +++
.../vo/financial/admin/DebtTrackingVo.java | 7 +++
.../dao/vo/financial/admin/SavingGoalVo.java | 15 +++++-
service/src/Dockerfile | 4 +-
.../DebtRepaymentPlanController.java | 6 +--
.../financial/SavingGoalController.java | 6 +--
.../financial/DebtRepaymentPlanMapper.java | 2 +-
.../mapper/financial/SavingGoalMapper.java | 2 +-
.../financial/DebtRepaymentPlanService.java | 6 +--
.../service/financial/SavingGoalService.java | 6 +--
.../impl/DebtRepaymentPlanServiceImpl.java | 6 +--
.../financial/impl/SavingGoalServiceImpl.java | 6 +--
.../src/main/resources/application-dev.yml | 3 --
.../src/main/resources/application-prod.yml | 3 --
service/src/main/resources/application.yml | 3 ++
.../mapper/financial/BudgetCategoryMapper.xml | 2 +-
.../financial/DebtRepaymentPlanMapper.xml | 1 +
.../mapper/financial/DebtTrackingMapper.xml | 2 +
.../mapper/financial/SavingGoalMapper.xml | 2 +-
39 files changed, 164 insertions(+), 204 deletions(-)
delete mode 100644 dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementAddDto.java
delete mode 100644 dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementDto.java
delete mode 100644 dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementUpdateDto.java
rename dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/{admin => }/DebtRepaymentPlanAddDto.java (83%)
rename dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/{admin => }/DebtRepaymentPlanDto.java (80%)
rename dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/{admin => }/DebtRepaymentPlanUpdateDto.java (84%)
rename dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/{admin => }/SavingGoalAddDto.java (76%)
rename dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/{admin => }/SavingGoalDto.java (71%)
rename dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/{admin => }/SavingGoalUpdateDto.java (76%)
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillAddDto.java
index 990d2ea..1097f52 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillAddDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillAddDto.java
@@ -21,7 +21,6 @@ import java.time.LocalDateTime;
public class BillAddDto {
@Schema(name = "userId", title = "绑定的用户id")
- @NotNull(message = "债绑定的用户不能为空")
private Long userId;
@Schema(name = "username", title = "类型：1 - 收入，-1 - 支出")
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillUpdateDto.java
index bf6c759..593e88f 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillUpdateDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/bill/admin/BillUpdateDto.java
@@ -2,6 +2,8 @@ package cn.bunny.dao.dto.financial.bill.admin;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -23,13 +25,17 @@ public class BillUpdateDto {
private Long id;
@Schema(name = "userId", title = "绑定的用户id")
- @NotNull(message = "债绑定的用户不能为空")
private Long userId;
@Schema(name = "username", title = "类型：1 - 收入，-1 - 支出")
+ @NotNull(message = "类型不能为空")
+ @Min(value = -1, message = "类型格式不正确")
+ @Max(value = 1, message = "类型格式不正确")
private Byte type;
@Schema(name = "amount", title = "金额")
+ @NotNull(message = "金额不能为空")
+ @Min(value = 0, message = "金额格式不正确")
private BigDecimal amount;
@Schema(name = "description", title = "描述")
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java
index f516023..64b2011 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java
@@ -1,5 +1,6 @@
package cn.bunny.dao.dto.financial.budgetCategory;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
@@ -10,6 +11,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@@ -43,15 +45,17 @@ public class BudgetCategoryAddDto {
@Schema(name = "amount", title = "预算金额")
@NotNull(message = "预算金额不能为空")
- @Min(value = 0L, message = "不能低于0")
+ @Min(value = 0, message = "不能低于0")
private BigDecimal amount;
-
- @Schema(name = "period", title = "预算周期")
- @NotNull(message = "预算周期不能为空")
- private String startPeriod;
@Schema(name = "period", title = "预算周期")
@NotNull(message = "预算周期不能为空")
- private String endPeriod;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startPeriod;
+
+ @Schema(name = "period", title = "预算周期")
+ @NotNull(message = "预算周期不能为空")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endPeriod;
}
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java
index 42a2f12..266a65d 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java
@@ -1,5 +1,6 @@
package cn.bunny.dao.dto.financial.budgetCategory;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -7,6 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
+import java.time.LocalDate;
@Data
@AllArgsConstructor
@@ -30,11 +32,13 @@ public class BudgetCategoryDto {
@Schema(name = "amount", title = "预算金额")
private BigDecimal amount;
- @Schema(name = "period", title = "预算周期")
- private String startPeriod;
+ @Schema(name = "startPeriod", title = "开始预算周期")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private LocalDate startPeriod;
- @Schema(name = "period", title = "预算周期")
- private String endPeriod;
+ @Schema(name = "endPeriod", title = "结束预算周期")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private LocalDate endPeriod;
}
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java
index 860957f..ed608e8 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java
@@ -1,6 +1,8 @@
package cn.bunny.dao.dto.financial.budgetCategory;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -9,6 +11,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@@ -46,15 +49,18 @@ public class BudgetCategoryUpdateDto {
@Schema(name = "amount", title = "预算金额")
@NotNull(message = "预算金额不能为空")
+ @Min(value = 0, message = "不能低于0")
private BigDecimal amount;
@Schema(name = "period", title = "预算周期")
@NotNull(message = "预算周期不能为空")
- private String startPeriod;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startPeriod;
@Schema(name = "period", title = "预算周期")
@NotNull(message = "预算周期不能为空")
- private String endPeriod;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endPeriod;
}
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementAddDto.java
deleted file mode 100644
index 238e541..0000000
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementAddDto.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.bunny.dao.dto.financial.debtCollectionManagement;
-
-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 = "DebtCollectionManagementAddDto对象", title = "债务回收管理添加", description = "债务回收管理添加")
-public class DebtCollectionManagementAddDto {
-
- @Schema(name = "debtId", title = "债务ID")
- @NotNull(message = "债务不能为空")
- private Long debtId;
-
- @Schema(name = "recoveryDate", title = "回收日期")
- @NotNull(message = "回收日期不能为空")
- private LocalDateTime recoveryDate;
-
- @Schema(name = "recoveryAmount", title = "回收金额")
- @NotNull(message = "回收金额不能为空")
- private BigDecimal recoveryAmount;
-
- @Schema(name = "recoveryMethod", title = "回收方式")
- @NotNull(message = "回收方式不能为空")
- @NotBlank(message = "还款状态不能为空")
- private String recoveryMethod;
-
- @Schema(name = "notes", title = "备注")
- @NotNull(message = "备注不能为空")
- @NotBlank(message = "备注不能为空")
- private String notes;
-
-}
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementDto.java
deleted file mode 100644
index a39f479..0000000
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementDto.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.bunny.dao.dto.financial.debtCollectionManagement;
-
-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 = "DebtCollectionManagementDto对象", title = "债务回收管理查询", description = "债务回收管理查询")
-public class DebtCollectionManagementDto {
-
- @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;
-
-}
-
-
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementUpdateDto.java
deleted file mode 100644
index 96f8499..0000000
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementUpdateDto.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.bunny.dao.dto.financial.debtCollectionManagement;
-
-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 = "DebtCollectionManagementUpdateDto对象", title = "债务回收管理更新", description = "债务回收管理更新")
-public class DebtCollectionManagementUpdateDto {
-
- @Schema(name = "id", title = "主键")
- @NotNull(message = "id不能为空")
- private Long id;
-
- @Schema(name = "debtId", title = "债务ID")
- @NotNull(message = "债务不能为空")
- private Long debtId;
-
- @Schema(name = "recoveryDate", title = "回收日期")
- @NotNull(message = "回收日期不能为空")
- private LocalDateTime recoveryDate;
-
- @Schema(name = "recoveryAmount", title = "回收金额")
- @NotNull(message = "回收金额不能为空")
- private BigDecimal recoveryAmount;
-
- @Schema(name = "recoveryMethod", title = "回收方式")
- @NotNull(message = "回收方式不能为空")
- @NotBlank(message = "还款状态不能为空")
- private String recoveryMethod;
-
- @Schema(name = "notes", title = "备注")
- @NotNull(message = "备注不能为空")
- @NotBlank(message = "备注不能为空")
- private String notes;
-
-}
\ No newline at end of file
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java
similarity index 83%
rename from dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanAddDto.java
rename to dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java
index 52197eb..e7236f4 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanAddDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java
@@ -1,6 +1,8 @@
-package cn.bunny.dao.dto.financial.debtRepaymentPlan.admin;
+package cn.bunny.dao.dto.financial.debtRepaymentPlan;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -31,10 +33,12 @@ public class DebtRepaymentPlanAddDto {
@Schema(name = "dueDate", title = "还款截止日期")
@NotNull(message = "还款截止日期不能为空")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dueDate;
@Schema(name = "paidAmount", title = "已还金额")
@NotNull(message = "已还金额不能为空")
+ @Min(value = 0, message = "金额格式不正确")
private BigDecimal paidAmount;
@Schema(name = "paymentStatus", title = "还款状态")
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java
similarity index 80%
rename from dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanDto.java
rename to dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java
index b102f3f..9489672 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java
@@ -1,5 +1,6 @@
-package cn.bunny.dao.dto.financial.debtRepaymentPlan.admin;
+package cn.bunny.dao.dto.financial.debtRepaymentPlan;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -7,7 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
@Data
@AllArgsConstructor
@@ -26,7 +27,8 @@ public class DebtRepaymentPlanDto {
private BigDecimal installmentAmount;
@Schema(name = "dueDate", title = "还款截止日期")
- private LocalDateTime dueDate;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private LocalDate dueDate;
@Schema(name = "paidAmount", title = "已还金额")
private BigDecimal paidAmount;
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java
similarity index 84%
rename from dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanUpdateDto.java
rename to dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java
index 5a328f9..86cc58d 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanUpdateDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java
@@ -1,6 +1,8 @@
-package cn.bunny.dao.dto.financial.debtRepaymentPlan.admin;
+package cn.bunny.dao.dto.financial.debtRepaymentPlan;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -31,10 +33,12 @@ public class DebtRepaymentPlanUpdateDto {
@Schema(name = "installmentAmount", title = "每期应还金额")
@NotNull(message = "每期应还金额不能为空")
+ @Min(value = 0, message = "金额格式不正确")
private BigDecimal installmentAmount;
@Schema(name = "dueDate", title = "还款截止日期")
@NotNull(message = "还款截止日期不能为空")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dueDate;
@Schema(name = "paidAmount", title = "已还金额")
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
index 6d345ac..2f59263 100644
--- 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
@@ -1,6 +1,8 @@
package cn.bunny.dao.dto.financial.debtTracking;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -29,6 +31,7 @@ public class DebtTrackingAddDto {
@Schema(name = "debtAmount", title = "债务金额")
@NotNull(message = "债务不能为空")
+ @Min(value = 0, message = "金额格式不正确")
private BigDecimal debtAmount;
@Schema(name = "debtType", title = "债务类型")
@@ -43,6 +46,7 @@ public class DebtTrackingAddDto {
@Schema(name = "dueDate", title = "还款截止日期")
@NotNull(message = "债务不能为空")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
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
index e901965..e3891c8 100644
--- 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
@@ -1,5 +1,6 @@
package cn.bunny.dao.dto.financial.debtTracking;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -7,7 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
@Data
@AllArgsConstructor
@@ -32,7 +33,8 @@ public class DebtTrackingDto {
private String debtStatus;
@Schema(name = "dueDate", title = "还款截止日期")
- private LocalDateTime dueDate;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private LocalDate 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
index 77bcc0a..710a812 100644
--- 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
@@ -1,6 +1,8 @@
package cn.bunny.dao.dto.financial.debtTracking;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -23,7 +25,6 @@ public class DebtTrackingUpdateDto {
private Long id;
@Schema(name = "userId", title = "绑定的用户")
- @NotNull(message = "债务不能为空")
private Long userId;
@Schema(name = "debtorName", title = "债务人姓名")
@@ -33,6 +34,7 @@ public class DebtTrackingUpdateDto {
@Schema(name = "debtAmount", title = "债务金额")
@NotNull(message = "债务不能为空")
+ @Min(value = 0, message = "金额格式不正确")
private BigDecimal debtAmount;
@Schema(name = "debtType", title = "债务类型")
@@ -47,6 +49,7 @@ public class DebtTrackingUpdateDto {
@Schema(name = "dueDate", title = "还款截止日期")
@NotNull(message = "债务不能为空")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dueDate;
}
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalAddDto.java
similarity index 76%
rename from dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java
rename to dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalAddDto.java
index 0ab3082..e61d9ca 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalAddDto.java
@@ -1,5 +1,6 @@
-package cn.bunny.dao.dto.financial.savingGoal.admin;
+package cn.bunny.dao.dto.financial.savingGoal;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
@@ -10,6 +11,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@@ -34,17 +36,17 @@ public class SavingGoalAddDto {
@Schema(name = "amount", title = "目标金额")
@NotNull(message = "目标金额不能为空")
- @Min(value = 0L, message = "储蓄值不能小于0")
+ @Min(value = 0, message = "储蓄值不能小于0")
private BigDecimal amount;
@Schema(name = "startDuration", title = "开始目标时长")
@NotNull(message = "开始目标时长不能为空")
- @NotBlank(message = "开始目标时长不能为空")
- private String startDuration;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startDuration;
@Schema(name = "endDuration", title = "结束目标时长")
@NotNull(message = "结束目标时长不能为空")
- @NotBlank(message = "结束目标时长不能为空")
- private String endDuration;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endDuration;
}
\ No newline at end of file
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java
similarity index 71%
rename from dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalDto.java
rename to dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java
index e7423bb..55665f4 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java
@@ -1,5 +1,6 @@
-package cn.bunny.dao.dto.financial.savingGoal.admin;
+package cn.bunny.dao.dto.financial.savingGoal;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -7,6 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
+import java.time.LocalDate;
@Data
@AllArgsConstructor
@@ -28,9 +30,11 @@ public class SavingGoalDto {
private BigDecimal amount;
@Schema(name = "startDuration", title = "开始目标时长")
- private String startDuration;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private LocalDate startDuration;
@Schema(name = "endDuration", title = "结束目标时长")
- private String endDuration;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private LocalDate endDuration;
}
diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalUpdateDto.java
similarity index 76%
rename from dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java
rename to dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalUpdateDto.java
index 5ee2bc0..26259aa 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalUpdateDto.java
@@ -1,6 +1,8 @@
-package cn.bunny.dao.dto.financial.savingGoal.admin;
+package cn.bunny.dao.dto.financial.savingGoal;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -9,6 +11,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@@ -37,16 +40,17 @@ public class SavingGoalUpdateDto {
@Schema(name = "amount", title = "目标金额")
@NotNull(message = "目标金额不能为空")
+ @Min(value = 0, message = "金额格式不正确")
private BigDecimal amount;
@Schema(name = "startDuration", title = "开始目标时长")
@NotNull(message = "开始目标时长不能为空")
- @NotBlank(message = "开始目标时长不能为空")
- private String startDuration;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startDuration;
@Schema(name = "endDuration", title = "结束目标时长")
@NotNull(message = "结束目标时长不能为空")
- @NotBlank(message = "结束目标时长不能为空")
- private String endDuration;
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endDuration;
}
diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java b/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java
index 2c56a98..7868ed3 100644
--- a/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java
+++ b/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java
@@ -8,6 +8,7 @@ import lombok.Setter;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
*
@@ -42,10 +43,10 @@ public class BudgetCategory extends BaseEntity {
@Schema(name = "amount", title = "预算金额")
private BigDecimal amount;
- @Schema(name = "startPeriod", title = "开始预算周期")
- private String startPeriod;
+ @Schema(name = "period", title = "预算周期")
+ private LocalDateTime startPeriod;
- @Schema(name = "endPeriod", title = "结束预算周期")
- private String endPeriod;
+ @Schema(name = "period", title = "预算周期")
+ private LocalDateTime endPeriod;
}
diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java b/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java
index f61a6ad..3f929cc 100644
--- a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java
+++ b/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java
@@ -8,6 +8,7 @@ import lombok.Setter;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
*
@@ -37,10 +38,10 @@ public class SavingGoal extends BaseEntity {
private BigDecimal amount;
@Schema(name = "startDuration", title = "开始目标时长")
- private String startDuration;
+ private LocalDateTime startDuration;
@Schema(name = "endDuration", title = "结束目标时长")
- private String endDuration;
+ private LocalDateTime endDuration;
}
diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java
index c23ba84..35af24a 100644
--- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java
+++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java
@@ -3,11 +3,16 @@ package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true)
@Data
@@ -42,10 +47,16 @@ public class BudgetCategoryVo extends BaseUserVo {
@Schema(name = "amount", title = "预算金额")
private BigDecimal amount;
- @Schema(name = "period", title = "预算周期")
- private String startPeriod;
+ @Schema(name = "startPeriod", title = "预算周期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ private LocalDateTime startPeriod;
- @Schema(name = "period", title = "预算周期")
- private String endPeriod;
+ @Schema(name = "endPeriod", title = "预算周期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ private LocalDateTime endPeriod;
}
\ No newline at end of file
diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java
index 4264ae1..c95023b 100644
--- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java
+++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java
@@ -3,7 +3,11 @@ package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -33,6 +37,9 @@ public class DebtRepaymentPlanVo extends BaseUserVo {
private BigDecimal installmentAmount;
@Schema(name = "dueDate", title = "还款截止日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime dueDate;
@Schema(name = "paidAmount", title = "已还金额")
diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java
index 79fda1c..ee4b9d5 100644
--- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java
+++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java
@@ -3,7 +3,11 @@ package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -39,6 +43,9 @@ public class DebtTrackingVo extends BaseUserVo {
private String debtStatus;
@Schema(name = "dueDate", title = "还款截止日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime dueDate;
}
\ No newline at end of file
diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java
index 8fc5700..049510b 100644
--- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java
+++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java
@@ -3,11 +3,16 @@ package cn.bunny.dao.vo.financial.admin;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true)
@Data
@@ -35,9 +40,15 @@ public class SavingGoalVo extends BaseUserVo {
private BigDecimal amount;
@Schema(name = "startDuration", title = "开始目标时长")
- private String startDuration;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ private LocalDateTime startDuration;
@Schema(name = "endDuration", title = "结束目标时长")
- private String endDuration;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ private LocalDateTime endDuration;
}
\ No newline at end of file
diff --git a/service/src/Dockerfile b/service/src/Dockerfile
index 0039cda..b156483 100644
--- a/service/src/Dockerfile
+++ b/service/src/Dockerfile
@@ -24,8 +24,8 @@ VOLUME ["/www/root/server"]
# 启动容器时的进程
ENTRYPOINT ["java","-jar","/home/server/app.jar"]
-#暴露 8000 端口
-EXPOSE 8000
+#暴露 1010 端口
+EXPOSE 1010
# 生产环境
# mvn clean package -Pprod -DskipTests
diff --git a/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java b/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java
index d062334..8725ad0 100644
--- a/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java
+++ b/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java
@@ -1,8 +1,8 @@
package cn.bunny.services.controller.financial;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDto;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto;
+import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanAddDto;
+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.pojo.result.Result;
diff --git a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java
index c5b17ee..395b893 100644
--- a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java
+++ b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java
@@ -1,8 +1,8 @@
package cn.bunny.services.controller.financial;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto;
+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.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java
index 93d1ceb..251c5df 100644
--- a/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java
+++ b/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java
@@ -1,6 +1,6 @@
package cn.bunny.services.mapper.financial;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto;
+import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto;
import cn.bunny.dao.entity.financial.DebtRepaymentPlan;
import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java
index 34a0db6..e8ee7da 100644
--- a/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java
+++ b/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java
@@ -1,6 +1,6 @@
package cn.bunny.services.mapper.financial;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto;
+import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto;
import cn.bunny.dao.entity.financial.SavingGoal;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java b/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java
index 41ba13a..55c13c0 100644
--- a/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java
+++ b/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java
@@ -1,8 +1,8 @@
package cn.bunny.services.service.financial;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDto;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto;
+import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanAddDto;
+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.admin.DebtRepaymentPlanVo;
diff --git a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java
index 251f522..7101682 100644
--- a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java
+++ b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java
@@ -1,8 +1,8 @@
package cn.bunny.services.service.financial;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto;
+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.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java
index fdf3436..4c6092f 100644
--- a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java
@@ -1,8 +1,8 @@
package cn.bunny.services.service.financial.impl;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDto;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto;
-import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto;
+import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanAddDto;
+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.admin.DebtRepaymentPlanVo;
diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java
index eea92d1..efa7c29 100644
--- a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java
@@ -1,8 +1,8 @@
package cn.bunny.services.service.financial.impl;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto;
-import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto;
+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.pojo.result.PageResult;
import cn.bunny.dao.vo.financial.admin.SavingGoalVo;
diff --git a/service/src/main/resources/application-dev.yml b/service/src/main/resources/application-dev.yml
index ce8036b..44504ac 100644
--- a/service/src/main/resources/application-dev.yml
+++ b/service/src/main/resources/application-dev.yml
@@ -1,6 +1,3 @@
-server:
- port: 7070
-
logging:
level:
cn.bunny.service.mapper: info
diff --git a/service/src/main/resources/application-prod.yml b/service/src/main/resources/application-prod.yml
index fd20a80..4ebaaa5 100644
--- a/service/src/main/resources/application-prod.yml
+++ b/service/src/main/resources/application-prod.yml
@@ -1,6 +1,3 @@
-server:
- port: 7070
-
#mybatis-plus:
# configuration:
# map-underscore-to-camel-case: true
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 9922645..692832b 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -1,3 +1,6 @@
+server:
+ port: 1000
+
spring:
profiles:
active: @profiles.active@
diff --git a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml
index 7604b46..cb8d2c7 100644
--- a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml
+++ b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml
@@ -55,7 +55,7 @@
and (base.start_period between #{dto.startPeriod} and #{dto.endPeriod})
- and (base.end_period between #{dto.startPeriod} and #{dto.endPeriod})
+ or (base.end_period between #{dto.startPeriod} and #{dto.endPeriod})
diff --git a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml
index d62b8a8..14ea890 100644
--- a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml
+++ b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml
@@ -27,6 +27,7 @@