feat(garden): 引入养护周期枚举并优化计划创建逻辑

- 新增 MaintenanceCycleEnum 枚举类，定义养护周期类型及其键值映射 - 在 InspectionPlanServiceImpl 和 MaintainPlanServiceImpl 中引入该枚举 - 替换硬编码的周期 ID 判断逻辑，使用枚举提升可读性和维护性 - 统一字典类型常量引用，移除重复定义 - 增强对周期ID的数据校验，确保输入合法性

feat(garden): 引入养护周期枚举并优化计划创建逻辑
- 新增 MaintenanceCycleEnum 枚举类，定义养护周期类型及其键值映射 - 在 InspectionPlanServiceImpl 和 MaintainPlanServiceImpl 中引入该枚举 - 替换硬编码的周期 ID 判断逻辑，使用枚举提升可读性和维护性 - 统一字典类型常量引用，移除重复定义 - 增强对周期ID的数据校验，确保输入合法性
王彪总
1 parent c3c48b97
Showing 3 changed files with 87 additions and 6 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/MaintenanceCycleEnum.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
+package com.zteits.urbanops.module.garden.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum MaintenanceCycleEnum {
+
+    /**
+     * 字典标签与字典键值对应关系：
+     * 次 → 0
+     * 次/日 → 1
+     * 次/周 → 2
+     * 次/月 → 3
+     * 次/季 → 4
+     * 次/半年 → 5
+     * 次/年 → 6
+     */
+    TIME(0, "次"),
+    DAY(1, "次/日"),
+    WEEK(2, "次/周"),
+    MONTH(3, "次/月"),
+    QUARTER(4, "次/季"),
+    SEMIANNUAL(5, "次/半年"),
+    YEAR(6, "次/年");
+
+    private final Integer key;
+    private final String value;
+
+    // 用于根据key快速查找枚举
+    private static final Map<Integer, MaintenanceCycleEnum> KEY_MAP = new HashMap<>();
+
+    static {
+        // 初始化key映射
+        for (MaintenanceCycleEnum cycleEnum : values()) {
+            KEY_MAP.put(cycleEnum.key, cycleEnum);
+        }
+    }
+
+    /**
+     * 构造函数
+     * @param key 字典键值
+     * @param value 字典标签
+     */
+    MaintenanceCycleEnum(Integer key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * 根据key获取对应的枚举
+     * @param key 字典键值
+     * @return 对应的枚举，如果不存在返回null
+     */
+    public static MaintenanceCycleEnum getByKey(Integer key) {
+        return KEY_MAP.get(key);
+    }
+
+    /**
+     * 根据key获取对应的字典标签
+     * @param key 字典键值
+     * @return 对应的字典标签，如果不存在返回null
+     */
+    public static String getValueByKey(Integer key) {
+        MaintenanceCycleEnum cycleEnum = getByKey(key);
+        return cycleEnum != null ? cycleEnum.value : null;
+    }
+
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
 \ No newline at end of file
@@ -24,11 +24,13 @@ import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlan
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanRoleMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper;
 import com.zteits.urbanops.module.garden.enums.FinishStateEnum;
+import com.zteits.urbanops.module.garden.enums.MaintenanceCycleEnum;
 import com.zteits.urbanops.module.garden.enums.PlanConstants;
 import com.zteits.urbanops.module.garden.util.timeinterval.PeriodResult;
 import com.zteits.urbanops.module.garden.util.timeinterval.TimeIntervalFrequencyUtil;
 import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
+import com.zteits.urbanops.module.system.api.dict.DictDataApi;
 import com.zteits.urbanops.module.system.api.permission.RoleApi;
 import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO;
 import jakarta.annotation.Resource;
@@ -48,6 +50,7 @@ import java.util.stream.Collectors;
  
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
+import static com.zteits.urbanops.module.garden.enums.PlanConstants.CYCLE_ID_TYPE;
  
 /**
  * 巡检计划汇总 Service 实现类
@@ -73,13 +76,13 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
  
     @Resource
     private RoadMapper roadMapper;
-
-
     @Resource
     private DeptApi deptApi;
  
     @Resource
     private RoleApi roleApi;
+    @Resource
+    private DictDataApi dictDataApi;
  
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -100,7 +103,8 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         //计算计划次数
         int planNum;
         //临时计划
-        if (createReqVO.getCycleId().equals(5)) {
+        dictDataApi.validateDictDataList(CYCLE_ID_TYPE, Collections.singleton(createReqVO.getCycleId().toString().trim()));
+        if (createReqVO.getCycleId().equals(MaintenanceCycleEnum.TIME.getKey())) {
             calculate = new ArrayList<>();
             PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue()));
             calculate.add(periodResult);
@@ -25,6 +25,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanInte
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanRoleMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper;
 import com.zteits.urbanops.module.garden.enums.FinishStateEnum;
+import com.zteits.urbanops.module.garden.enums.MaintenanceCycleEnum;
 import com.zteits.urbanops.module.garden.enums.PlanConstants;
 import com.zteits.urbanops.module.garden.util.timeinterval.PeriodResult;
 import com.zteits.urbanops.module.garden.util.timeinterval.TimeIntervalFrequencyUtil;
@@ -57,6 +58,8 @@ import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanMapp
  
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
+import static com.zteits.urbanops.module.garden.enums.PlanConstants.CYCLE_ID_TYPE;
+
  
 /**
  * 养护计划汇总 Service 实现类
@@ -95,7 +98,6 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     /**
      * 字典类型：养护周期类型
      */
-    private static final String DICT_TYPE_CYCLE_ID = "cycle_id_type";
  
     @Override
     public CommonResult<Integer> createMaintainPlan(MaintainPlanSaveReqVO createReqVO) {
@@ -115,8 +117,8 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         //计算计划次数
         int planNum;
         //按次计划
-        dictDataApi.validateDictDataList(DICT_TYPE_CYCLE_ID, Collections.singleton(createReqVO.getCycleId().toString().trim()));
-        if (createReqVO.getCycleId().equals(5)) {
+        dictDataApi.validateDictDataList(CYCLE_ID_TYPE, Collections.singleton(createReqVO.getCycleId().toString().trim()));
+        if (createReqVO.getCycleId().equals(MaintenanceCycleEnum.TIME.getKey())) {
             calculate = new ArrayList<>();
             PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue()));
             calculate.add(periodResult);