养护计划提交

王富生
1 parent 7a75ca93
Showing 7 changed files with 127 additions and 42 deletions
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/admin/maintainplan/vo/MaintainPlanUpdateReqVO.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/MaintainPlanService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
@@ -15,6 +15,7 @@ import jakarta.validation.constraints.*;
 public class InspectionPlanSaveReqVO {
     @Schema(description = "计划名称后缀", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "张三")
+    @Size(max = 15)
     private String planNameSuffix;
     @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -48,7 +48,7 @@ public class MaintainPlanController {
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan:create')")
     public CommonResult<Integer> createMaintainPlan(@Valid @RequestBody MaintainPlanSaveReqVO createReqVO) {
         if(!createReqVO.verify()){
-            log.warn("次数值范围:1-20或者分数格式：1/3, rateValue={}", createReqVO.getRateValue());
+            log.warn("次数值范围:1-10或者分数格式：1/3, rateValue={}", createReqVO.getRateValue());
             return error(PLAN_RATE_VALUE_ERROR);
         }
         return maintainPlanService.createMaintainPlan(createReqVO);
@@ -57,7 +57,7 @@ public class MaintainPlanController {
     @PutMapping("/update")
     @Operation(summary = "更新养护计划汇总")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan:update')")
-    public CommonResult<Boolean> updateMaintainPlan(@Valid @RequestBody MaintainPlanSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateMaintainPlan(@Valid @RequestBody MaintainPlanUpdateReqVO updateReqVO) {
         maintainPlanService.updateMaintainPlan(updateReqVO);
         return success(true);
     }
 package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRoadReqVO;
 import com.zteits.urbanops.module.garden.util.StringValidateUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
@@ -14,21 +15,22 @@ import jakarta.validation.constraints.*;
 public class MaintainPlanSaveReqVO {
     @Schema(description = "计划名称后缀", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "张三")
+    @Size(max = 15)
     private String planNameSuffix;
     @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政不能为空")
     private String busiLine;
-    @Schema(description = "计划属性:1:标准计划；2:临时计划", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "计划属性:1:标准计划；2:临时计划", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "计划属性:1:标准计划；2:临时计划不能为空")
     private Integer planAttr;
-    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "7439")
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
     @NotNull(message = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;不能为空")
     private Integer planTypeId;
-    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1713")
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800")
     @NotNull(message = "归属(一级部门id)不能为空")
     private Long companyId;
@@ -38,8 +40,7 @@ public class MaintainPlanSaveReqVO {
     @Valid
     private List<MaintainPlanRoadReqVO> roadListReqVO;
-
-    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "16420")
+    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588")
     @NotNull(message = "养护级别: 10:特级；11:一级：12:二级;13:三级不能为空")
     private Integer levelId;
@@ -47,8 +48,10 @@ public class MaintainPlanSaveReqVO {
     @NotEmpty(message = "频次值不能为空")
     private String rateValue;
-    @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "28220")
+    @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 = "开始时间")
@@ -57,7 +60,7 @@ public class MaintainPlanSaveReqVO {
     @Schema(description = "开始时间")
     private LocalDate endTime;
-    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
     private String remark;
     @NotNull(message = "角色Ids不能为空")
+package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo;
+
+import com.zteits.urbanops.module.garden.util.StringValidateUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+
+@Schema(description = "管理后台 - 养护计划汇总新增/修改 Request VO")
+@Data
+public class MaintainPlanUpdateReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10938")
+    private Long id;
+
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政不能为空")
+    private String busiLine;
+
+    @Schema(description = "计划属性:1:标准计划；2:临时计划", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "计划属性:1:标准计划；2:临时计划不能为空")
+    private Integer planAttr;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    @NotNull(message = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;不能为空")
+    private Integer planTypeId;
+
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800")
+    @NotNull(message = "归属(一级部门id)不能为空")
+    private Long companyId;
+
+    @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "16445")
+    @NotNull(message = "部门ID(道路负责部门id)不能为空")
+    private Long deptId;
+
+    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15557")
+    @NotNull(message = "道路ID不能为空")
+    private Long roadId;
+
+    @Schema(description = "道路名称", example = "赵六")
+    private String roadName;
+
+    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588")
+    @NotNull(message = "养护级别: 10:特级；11:一级：12:二级;13:三级不能为空")
+    private Integer levelId;
+
+    @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "6415")
+    @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次不能为空")
+    private Integer cycleId;
+
+    @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "计划次数不能为空")
+    private Integer planNum;
+
+    @Schema(description = "已完成次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "已完成次数不能为空")
+    private Integer planFinishNum;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "完成状态 1:未完成;2:已完成不能为空")
+    private Integer finishState;
+
+    @Schema(description = "开始时间")
+    private LocalDateTime beginTime;
+
+    @Schema(description = "开始时间")
+    private LocalDateTime endTime;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
+    @NotEmpty(message = "备注不能为空")
+    private String remark;
+}
 \ No newline at end of file
@@ -138,7 +138,6 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
                 roleList.add(inspectionPlanRoleDO);
             });
             /*3.插入巡查计划明细*/
-
             for (PeriodResult periodResult : calculate) {
                 InspectionPlanDetailDO entity = getInspectionPlanDetailDO(batchNo, createReqVO, roadReqVO, now);
                 ThreadUtil.sleep(2);
@@ -29,7 +29,7 @@ public interface MaintainPlanService {
      *
      * @param updateReqVO 更新信息
      */
-    void updateMaintainPlan(@Valid MaintainPlanSaveReqVO updateReqVO);
+    void updateMaintainPlan(@Valid MaintainPlanUpdateReqVO updateReqVO);
     /**
      * 删除养护计划汇总
@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanRoleDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO;
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper;
@@ -71,24 +73,20 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Resource
     private RoleApi roleApi;
-    @Resource
-    private MaintainPlanRoleMapper  MaintainPlanRoleMapper;
-
     @Override
     public CommonResult<Integer> createMaintainPlan(MaintainPlanSaveReqVO createReqVO) {
         //存在性校验
         validateMaintainPlanExists(createReqVO);
         LocalDateTime now = LocalDateTime.now();
-        String userId = SecurityFrameworkUtils.getLoginUserId()+"";
+        String userId = SecurityFrameworkUtils.getLoginUserId() + "";
         String userName = SecurityFrameworkUtils.getLoginUserNickname();
         String rateValue;
         if (createReqVO.getRateValue().contains("/")) {
             rateValue = createReqVO.getRateValue().trim();
         } else {
-            rateValue = createReqVO.getRateValue().trim()+"/1";
+            rateValue = createReqVO.getRateValue().trim() + "/1";
         }
         //计算开始和计算时间 在间隔周期下每天的次数
-        //计算开始和计算时间 在间隔周期下每天的次数
         List<PeriodResult> calculate = TimeIntervalFrequencyUtil.calculate(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId());
         if (CollectionUtils.isEmpty(calculate)) {
             log.warn("获取两个时间之间间隔天数错误");
@@ -96,8 +94,6 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         }
         //计算计划次数
         Integer planNum = calculate.size();
-
-
         //巡检计划list
         List<MaintainPlanDO> maintainPlanList = new ArrayList<>();
         //角色列表
@@ -107,7 +103,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         //按照道路创建计划
         createReqVO.getRoadListReqVO().forEach(roadReqVO -> {
             MaintainPlanDO maintainPlan = BeanUtils.toBean(createReqVO, MaintainPlanDO.class);
-            String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(10000)+roadReqVO.getRoadId();
+            String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(10000) + roadReqVO.getRoadId();
             maintainPlan.setBatchNo(batchNo);
             maintainPlan.setPlanFinishNum(0);
             maintainPlan.setFinishState(FinishStateEnum.NOT_FINISHED.getStatus());
@@ -124,8 +120,8 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             maintainPlan.setRoadName(roadReqVO.getRoadName());
             //计划属性label
             String planAttrLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.GARDEN_PLAN_ATTR_REDIS_KEY, createReqVO.getPlanAttr());
-            String planTypeIdLabel  = DictFrameworkUtils.parseDictDataLabel(PlanConstants.MAINTAIN_TYPE, createReqVO.getPlanTypeId());
-            String planNameSuffix = StringUtil.isNotEmpty(createReqVO.getPlanNameSuffix()) ? createReqVO.getPlanNameSuffix() :"";
+            String planTypeIdLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.INSPECTION_MAINTAIN_TYPE, createReqVO.getPlanTypeId());
+            String planNameSuffix = StringUtil.isNotEmpty(createReqVO.getPlanNameSuffix()) ? createReqVO.getPlanNameSuffix() : "";
             maintainPlan.setPlanName(roadReqVO.getRoadName() + planAttrLabel + planTypeIdLabel + planNameSuffix);
             maintainPlanList.add(maintainPlan);
             /*2.插入角色*/
@@ -162,11 +158,11 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     private MaintainPlanDetailDO getMaintainPlanDetailDO(String batchNo, MaintainPlanSaveReqVO saveReqVO,
                                                          MaintainPlanRoadReqVO roadReqVO, LocalDateTime now) {
-        String userId = SecurityFrameworkUtils.getLoginUserId()+"";
+        String userId = SecurityFrameworkUtils.getLoginUserId() + "";
         String userName = SecurityFrameworkUtils.getLoginUserNickname();
         MaintainPlanDetailDO entity = new MaintainPlanDetailDO();
         entity.setBatchNo(batchNo);
-        entity.setPlanNo("Y" + DateUtil.format(new Date(), "yyyyMMddHHmmssSSS") + RandomUtil.randomInt(1000));
+        entity.setPlanNo("Y" + System.currentTimeMillis() + RandomUtil.randomInt(1000));
         entity.setBusiLine(saveReqVO.getBusiLine());
         entity.setCompanyId(saveReqVO.getCompanyId());
         entity.setDeptId(roadReqVO.getDeptId());
@@ -182,34 +178,41 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     }
     @Override
-    public void updateMaintainPlan(MaintainPlanSaveReqVO updateReqVO) {
+    public void updateMaintainPlan(MaintainPlanUpdateReqVO updateReqVO) {
         // 校验存在
-        //validateMaintainPlanExists(updateReqVO.getId());
+        validateMaintainPlanExists(updateReqVO.getId());
         // 更新
         MaintainPlanDO updateObj = BeanUtils.toBean(updateReqVO, MaintainPlanDO.class);
         maintainPlanMapper.updateById(updateObj);
     }
+    private void validateMaintainPlanExists(Long id) {
+        if (maintainPlanMapper.selectById(id) == null) {
+            throw exception(INSPECTION_PLAN_NOT_EXISTS);
+        }
+    }
+
+
     @Override
     public void deleteMaintainPlan(Long id) {
         // 校验存在
-        //validateMaintainPlanExists(id);
+        validateMaintainPlanExists(id);
         // 删除
         maintainPlanMapper.deleteById(id);
     }
     @Override
-        public void deleteMaintainPlanListByIds(List<Long> ids) {
+    public void deleteMaintainPlanListByIds(List<Long> ids) {
         // 删除
         maintainPlanMapper.deleteByIds(ids);
-        }
+    }
     private void validateMaintainPlanExists(MaintainPlanSaveReqVO req) {
         Set<Long> roadIds = req.getRoadListReqVO().stream().map(MaintainPlanRoadReqVO::getRoadId).collect(Collectors.toSet());
-        Long count =0L;
+        Long count = 0L;
         //标准计划
-        if(req.getPlanAttr().equals(1)){
+        if (req.getPlanAttr().equals(1)) {
             QueryWrapper<MaintainPlanDO> sql = new QueryWrapper<>();
             sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId())
                     .in(MaintainPlanDO::getRoadId, roadIds)
@@ -217,7 +220,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
                     .ge(MaintainPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
             count = maintainPlanMapper.selectCount(sql);
-        }else{
+        } else {
             QueryWrapper<MaintainPlanDO> sql = new QueryWrapper<>();
             sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId())
                     .in(MaintainPlanDO::getRoadId, roadIds)
@@ -248,11 +251,12 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     /**
      * 回填部门/公司/角色
+     *
      * @param list 分页对象
      */
-    private void addDataInspectionPlan(List<MaintainPlanRespVO> list ){
-        if(org.springframework.util.CollectionUtils.isEmpty(list)){
-            return ;
+    private void addDataInspectionPlan(List<MaintainPlanRespVO> list) {
+        if (org.springframework.util.CollectionUtils.isEmpty(list)) {
+            return;
         }
         //公司
@@ -264,22 +268,22 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
         list.forEach(plan -> {
-            DeptRespDTO dept =  deptMap.get(plan.getDeptId());
+            DeptRespDTO dept = deptMap.get(plan.getDeptId());
             if (dept != null) {
                 plan.setDeptName(dept.getName());
             }
-            DeptRespDTO company =  deptMap.get(plan.getCompanyId());
-            if(company != null){
+            DeptRespDTO company = deptMap.get(plan.getCompanyId());
+            if (company != null) {
                 plan.setCompanyName(company.getName());
             }
             List<MaintainPlanRoleDO> roleList = maintainPlanRoleMapper.selectList(new QueryWrapper<MaintainPlanRoleDO>().lambda()
                     .eq(MaintainPlanRoleDO::getBatchNo, plan.getBatchNo()));
             Set<Long> roleIds = roleList.stream().map(MaintainPlanRoleDO::getRoleId).collect(Collectors.toSet());
-            if(!org.springframework.util.CollectionUtils.isEmpty(roleIds)){
+            if (!org.springframework.util.CollectionUtils.isEmpty(roleIds)) {
                 List<RoleDO> roles = roleApi.getRoleList(roleIds);
-                if(!org.springframework.util.CollectionUtils.isEmpty(roles)){
+                if (!org.springframework.util.CollectionUtils.isEmpty(roles)) {
                     plan.setRoleNameList(roles.stream().map(RoleDO::getName).collect(Collectors.toList()));
                 }
             }
@@ -290,7 +294,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Override
     public void deleteInspectionPlanByBatchNo(String batchNo) {
         MaintainPlanDO inspectionPlanDO = maintainPlanMapper.selectOne(MaintainPlanDO::getBatchNo, batchNo);
-        if(inspectionPlanDO !=null && inspectionPlanDO.getPlanFinishNum() >0){
+        if (inspectionPlanDO != null && inspectionPlanDO.getPlanFinishNum() > 0) {
             throw exception(INSPECTION_PLAN_NOT_ALLOW_DELETE);
         }
         maintainPlanMapper.deleteByBatchNo(batchNo);
@@ -301,7 +305,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Override
     public void stopPlanInspectionPlan(String batchNo) {
         maintainPlanMapper.delete(MaintainPlanDO::getBatchNo, batchNo);
-        maintainPlanDetailMapper.delete(MaintainPlanDetailDO::getBatchNo,batchNo);
+        maintainPlanDetailMapper.delete(MaintainPlanDetailDO::getBatchNo, batchNo);
         maintainPlanRoleMapper.delete(MaintainPlanRoleDO::getBatchNo, batchNo);
     }