app养护计划明细提交

王富生
1 parent bab40751
Showing 11 changed files with 14 additions and 26 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/inspectionplan/vo/InspectionPlanSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanCommitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.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/MaintainPlanCommitServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/StringValidateUtil.java
@@ -54,8 +54,8 @@ public class InspectionPlanController {
             log.warn("次数值范围:1-10或者分数格式：1/3, rateValue={}", createReqVO.getRateValue());
             return error(PLAN_RATE_VALUE_ERROR);
         }
-        //3002 临时计划
-        if(createReqVO.getPlanTypeId().equals(3002)){
+        //临时计划
+        if(createReqVO.getPlanAttr().equals(2)){
             if(!StringValidateUtil.isValidNumberStr(createReqVO.getRateValue())){
                 return error(PLAN_RATE_VALUE_INTEGER_ERROR);
             }
@@ -36,7 +36,7 @@ public class InspectionPlanSaveReqVO {
     @Schema(description = "道路信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "[{\"deptId\":11,\"roadId\":1,\"roadName\":\"测试\"}]")
     @NotNull
-    @Size(min = 1)
+    @Size(min = 1, message = "道路信息不能为空")
     @Valid
     private List<InspectionPlanRoadReqVO> roadListReqVO;
@@ -50,8 +50,6 @@ public class InspectionPlanSaveReqVO {
     @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次不能为空")
-    @Min(1)
-    @Max(4)
     private Integer cycleId;
     @Schema(description = "开始时间")
@@ -53,9 +53,8 @@ public class MaintainPlanController {
             log.warn("次数值范围:1-10或者分数格式：1/3, rateValue={}", createReqVO.getRateValue());
             return error(PLAN_RATE_VALUE_ERROR);
         }
-
-        //3002 临时计划
-        if(createReqVO.getPlanTypeId().equals(20010)){
+        //临时计划
+        if(createReqVO.getPlanAttr().equals(2)){
             if(!StringValidateUtil.isValidNumberStr(createReqVO.getRateValue())){
                 return error(PLAN_RATE_VALUE_INTEGER_ERROR);
             }
@@ -36,7 +36,7 @@ public class MaintainPlanSaveReqVO {
     @Schema(description = "道路信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "[{\"deptId\":11,\"roadId\":1,\"roadName\":\"测试\"}]")
     @NotNull
-    @Size(min = 1)
+    @Size(min = 1, message = "道路信息不能为空")
     @Valid
     private List<MaintainPlanRoadReqVO> roadListReqVO;
@@ -50,8 +50,6 @@ public class MaintainPlanSaveReqVO {
     @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次不能为空")
-    @Min(1)
-    @Max(4)
     private Integer cycleId;
     @Schema(description = "开始时间")
@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +37,7 @@ public class AppMaintainPlanCommitController {
     @Operation(summary = "获取养护计划-共同处理人明细")
     @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-commit:query')")
-    public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo) {
+    public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") @NotBlank String planNo) {
         return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo));
     }
@@ -28,14 +28,6 @@ public class AppMaintainPlanCommitSaveReqVO {
     @NotEmpty(message = "开始照片不能为空")
     private String beginImg;
-    @Schema(description = "养护面积:单位m²", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "养护面积:单位m²不能为空")
-    private Double opArea;
-
-    @Schema(description = "操作时长", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "操作时长不能为空")
-    private Double opTime;
-
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
     @Size(max = 128, message = "备注长度不能超过 128 个字符")
     private String remark;
@@ -97,7 +97,7 @@ public interface ErrorCodeConstants {
     ErrorCode PLAN_RATE_NOT_EXISTS = new ErrorCode(1-100-007-002, "未配置计划频次");
     ErrorCode PLAN_RATE_DETAIL_EXISTS = new ErrorCode(1-100-007-003, "计划频次已存在");
     ErrorCode PLAN_RATE_VALUE_ERROR = new ErrorCode(1-100-007-004, "次数值范围:1-10或者分数格式：1/3");
-    ErrorCode PLAN_RATE_VALUE_INTEGER_ERROR = new ErrorCode(1-100-007-005, "临时计划-次数值范围:1-20的整数");
+    ErrorCode PLAN_RATE_VALUE_INTEGER_ERROR = new ErrorCode(1-100-007-005, "临时计划-次数值范围:1-10的整数");
     ErrorCode MATERIAL_TYPE_NOT_EXISTS = new ErrorCode(1-100-004-001, "物料类型不存在");
     ErrorCode MATERIAL_TYPE_MANAGER_NOT_EXISTS = new ErrorCode(1-100-004-002, "耗材类别管理不存在");
@@ -99,7 +99,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         //计算计划次数
         int planNum;
         //临时计划
-        if (createReqVO.getPlanTypeId().equals(3002)) {
+        if (createReqVO.getPlanAttr().equals(2)) {
             calculate = new ArrayList<>();
             PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue()));
             calculate.add(periodResult);
@@ -110,8 +110,8 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         commitDO.setBeginImg(createReqVO.getBeginImg());
         commitDO.setProcessImg("[]");
         commitDO.setEndImg("[]");
-        commitDO.setOpArea(createReqVO.getOpArea());
-        commitDO.setOpTime(createReqVO.getOpTime());
+        commitDO.setOpArea(0.0);
+        commitDO.setOpTime(0.0);
         commitDO.setFinishTime(now);
         commitDO.setUserId(userId);
         commitDO.setUserName(userName);
@@ -106,7 +106,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         //计算计划次数
         int planNum;
         //临时计划比较特殊
-        if (createReqVO.getPlanTypeId().equals(20010)) {
+        if (createReqVO.getPlanAttr().equals(2)) {
             calculate = new ArrayList<>();
             PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue()));
             calculate.add(periodResult);
@@ -107,7 +107,7 @@ public class StringValidateUtil {
         // 3. 转换为数字并校验范围
         try {
             int number = Integer.parseInt(str);
-            return number >= 1 && number <= 20;
+            return number >= 1 && number <= 10;
         } catch (NumberFormatException e) {
             // 理论上不会走到这里（已通过正则校验），兜底处理
             return false;