BJ_FS / urbanops

Commit f2fb187d2bf1df3864a1d29de75df75919f5421c

Authored by 王彪总
1 parent 19d36e00

feat(garden): 优化养护计划时间段计算逻辑并调整接口权限控制 

- 在 InspectionPlanSaveReqVO 和 MaintainPlanSaveReqVO 中新增 rateValue 字段长度限制（最大6位）
- 替换原有时间段计算方法 calculate 为 calculateNew，提升周期拆分准确性
- 重写 TimeIntervalFrequencyUtil 工具类中的 calculateNew 方法，支持更灵活的时间段划分
- 新增 convertToDaysNew 方法用于将不同周期单位转换为固定天数
- 注释掉 RoadStreetController 中所有接口的权限校验注解，临时放开访问控制
- 更新测试用例，使用新的 calculateNew 方法进行验证
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java
  View file @f2fb187
@@ -46,7 +46,7 @@ public class InspectionPlanSaveReqVO { @@ -46,7 +46,7 @@ public class InspectionPlanSaveReqVO {
46 46
47 @Schema(description = "频次值", requiredMode = Schema.RequiredMode.REQUIRED) 47 @Schema(description = "频次值", requiredMode = Schema.RequiredMode.REQUIRED)
48 @NotEmpty(message = "频次值不能为空") 48 @NotEmpty(message = "频次值不能为空")
49 - @Size(max = 6) 49 + @Size(max = 6 , message = "频次值长度不能大于6")
50 private String rateValue; 50 private String rateValue;
51 51
52 @Schema(description = "周期ID: 0:次；1:日/次；2:周/次；3:月/次；4:季/次；5:半年/次；6:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 52 @Schema(description = "周期ID: 0:次；1:日/次；2:周/次；3:月/次；4:季/次；5:半年/次；6:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java
  View file @f2fb187
@@ -46,7 +46,7 @@ public class MaintainPlanSaveReqVO { @@ -46,7 +46,7 @@ public class MaintainPlanSaveReqVO {
46 46
47 @Schema(description = "频次值", requiredMode = Schema.RequiredMode.REQUIRED) 47 @Schema(description = "频次值", requiredMode = Schema.RequiredMode.REQUIRED)
48 @NotEmpty(message = "频次值不能为空") 48 @NotEmpty(message = "频次值不能为空")
49 - @Size(max = 6) 49 + @Size(max = 6 , message = "频次值长度不能大于6")
50 private String rateValue; 50 private String rateValue;
51 51
52 @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 52 @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")