refactor(garden): 移除巡检与养护计划中的临时计划校验逻辑

- 注释掉 InspectionPlanController 中的临时计划次数值校验代码 - 注释掉 MaintainPlanController 中的临时计划次数值校验代码 - 调整包导入顺序，优化代码结构可读性 - 统一静态资源导入方式，提升代码整洁度

refactor(garden): 移除巡检与养护计划中的临时计划校验逻辑
- 注释掉 InspectionPlanController 中的临时计划次数值校验代码 - 注释掉 MaintainPlanController 中的临时计划次数值校验代码 - 调整包导入顺序，优化代码结构可读性 - 统一静态资源导入方式，提升代码整洁度
王彪总
1 parent d58a0f8d
Showing 2 changed files with 57 additions and 64 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan;
-import com.zteits.urbanops.module.garden.util.StringValidateUtil;
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRespVO;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanSaveReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanUpdateReqVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
+import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
 import java.io.IOException;
+import java.util.List;
-import com.zteits.urbanops.framework.common.pojo.PageParam;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.pojo.CommonResult;
-import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-
-import static com.alibaba.druid.util.FnvHash.Constants.LOG;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.error;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
-
-import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
-
-import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RATE_VALUE_ERROR;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RATE_VALUE_INTEGER_ERROR;
-
-import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
-import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
-import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanService;
 @Tag(name = "管理后台 - 巡检计划汇总")
 @RestController
@@ -54,12 +50,12 @@ public class InspectionPlanController {
             log.warn("次数值范围:1-10或者分数格式：1/3, rateValue={}", createReqVO.getRateValue());
             return error(PLAN_RATE_VALUE_ERROR);
         }
-        //临时计划
-        if(createReqVO.getPlanAttr().equals(2)){
-            if(!StringValidateUtil.isValidNumberStr(createReqVO.getRateValue())){
-                return error(PLAN_RATE_VALUE_INTEGER_ERROR);
-            }
-        }
+//        //临时计划
+//        if(createReqVO.getPlanAttr().equals(2)){
+//            if(!StringValidateUtil.isValidNumberStr(createReqVO.getRateValue())){
+//                return error(PLAN_RATE_VALUE_INTEGER_ERROR);
+//            }
+//        }
         return inspectionPlanService.createInspectionPlan(createReqVO);
     }
@@ -138,4 +134,4 @@ public class InspectionPlanController {
                 list);
     }
-}
 \ No newline at end of file
+}
 package com.zteits.urbanops.module.garden.controller.admin.maintainplan;
-import com.zteits.urbanops.module.garden.util.StringValidateUtil;
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanRespVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanSaveReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanUpdateReqVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
+import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
 import java.io.IOException;
+import java.util.List;
-import com.zteits.urbanops.framework.common.pojo.PageParam;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.pojo.CommonResult;
-import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.error;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
-
-import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
-
-import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RATE_VALUE_ERROR;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RATE_VALUE_INTEGER_ERROR;
-
-import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
-import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
-import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanService;
 @Tag(name = "管理后台 - 养护计划汇总")
 @RestController
@@ -54,11 +51,11 @@ public class MaintainPlanController {
             return error(PLAN_RATE_VALUE_ERROR);
         }
         //临时计划
-        if(createReqVO.getPlanAttr().equals(2)){
-            if(!StringValidateUtil.isValidNumberStr(createReqVO.getRateValue())){
-                return error(PLAN_RATE_VALUE_INTEGER_ERROR);
-            }
-        }
+//        if(createReqVO.getPlanAttr().equals(2)){
+//            if(!StringValidateUtil.isValidNumberStr(createReqVO.getRateValue())){
+//                return error(PLAN_RATE_VALUE_INTEGER_ERROR);
+//            }
+//        }
         return maintainPlanService.createMaintainPlan(createReqVO);
     }
@@ -137,4 +134,4 @@ public class MaintainPlanController {
                 list);
     }
-}
 \ No newline at end of file
+}