养护频次增删改查提交

王富生
1 parent 2672c24e
Showing 11 changed files with 75 additions and 13 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/InspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateUpdateReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateMapper.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/InspectionPlanService.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/planrate/PlanRateServiceImpl.java
@@ -80,6 +80,17 @@ public class InspectionPlanController {
         return success(true);
     }
+    @DeleteMapping("/delete-stop-plan")
+    @Parameter(name = "batchNo", description = "批次号", required = true)
+    @Operation(summary = "根据batch_no删除巡检计划汇总")
+    @PreAuthorize("@ss.hasPermission('garden:inspection-plan:delete')")
+    public CommonResult<Boolean> stopPlanInspectionPlan(@RequestParam("batch_no") @NotBlank String batchNo) {
+        inspectionPlanService.stopPlanInspectionPlan(batchNo);
+        return success(true);
+    }
+
+
+
     @GetMapping("/get")
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
-import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
+import com.fhs.core.trans.vo.VO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
 import cn.idev.excel.annotation.*;
-import org.apache.ibatis.type.JdbcType;
 @Schema(description = "管理后台 - 巡检计划汇总 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class InspectionPlanRespVO {
+public class InspectionPlanRespVO implements VO {
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10938")
     @ExcelProperty("ID")
@@ -92,10 +89,13 @@ public class InspectionPlanRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
-    @Trans(type = TransType.SIMPLE, target = InspectionPlanDO.class, fields = {"creator", "creatorName"}, refs = {"creator", "creatorName"})
-    @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
+    @Schema(description = "创建人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO",
+            fields = "nickname", ref = "creatorName")
     private String creator;
+    @Schema(description = "创建人名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS")
+    @ExcelProperty("创建人")
     private String creatorName;
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.controller.admin.planrate.vo;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -25,4 +26,8 @@ public class PlanRatePageReqVO extends PageParam {
     @Schema(description = "是否为标准计划: 1:是；2:否")
     private Integer stdPlan;
+    @Schema(description = "类型：1:养护；2:巡查", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "类型：1:养护；2:巡查不能为空")
+    private Integer type;
+
 }
 \ No newline at end of file
@@ -23,6 +23,10 @@ public class PlanRateSaveReqVO {
     @NotNull(message = "是否为标准计划: 1:是；2:否不能为空")
     private Integer stdPlan;
+    @Schema(description = "类型：1:养护；2:巡查", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "类型：1:养护；2:巡查不能为空")
+    private Integer type;
+
     @NotNull@NotNull(message = "频次明细不能为空")
     @Size(min = 1)
     @Valid
@@ -34,6 +34,10 @@ public class PlanRateUpdateReqVO {
     @NotNull(message = "是否为标准计划: 1:是；2:否不能为空")
     private Integer stdPlan;
+    @Schema(description = "类型：1:养护；2:巡查", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "类型：1:养护；2:巡查不能为空")
+    private Integer type;
+
     @NotNull@NotNull(message = "频次明细不能为空")
     @Size(min = 1)
     @Valid
@@ -43,6 +43,10 @@ public class PlanRateDO extends BaseDO {
      * 是否为标准计划: 1:是；2:否
      */
     private Integer stdPlan;
+    /**
+     * 类型：1:养护；2:巡查
+     */
+    private Integer type;
 }
 \ No newline at end of file
@@ -24,6 +24,7 @@ public interface PlanRateMapper extends BaseMapperX&lt;PlanRateDO&gt; {
                 .eqIfPresent(PlanRateDO::getBusiLine, reqVO.getBusiLine())
                 .eqIfPresent(PlanRateDO::getPlanTypeId, reqVO.getPlanTypeId())
                 .eqIfPresent(PlanRateDO::getStdPlan, reqVO.getStdPlan())
+                .eq(PlanRateDO::getType, reqVO.getType())
                 .orderByDesc(PlanRateDO::getId));
     }
@@ -63,6 +63,7 @@ public interface ErrorCodeConstants {
     ErrorCode INSPECTION_CYCLE_ID_ERROR = new ErrorCode(1-200-100-002, "周期id错误");
     ErrorCode INSPECTION_CYCLE_ERROR = new ErrorCode(1-200-100-003, "获取两个时间之间间隔天数错误");
     ErrorCode INSPECTION_PLAN_EXISTS = new ErrorCode(1-200-100-004, "道路对应类型已存在记录");
+    ErrorCode INSPECTION_PLAN_NOT_ALLOW_DELETE = new ErrorCode(1-200-100-005, "计划已开始执行不能删除");
     //========== 频次 TODO 补充编号 ==========
     ErrorCode PLAN_RATE_EXISTS = new ErrorCode(1-200-200-001, "养护频次已存在");
@@ -66,4 +66,10 @@ public interface InspectionPlanService {
      */
     void deleteInspectionPlanByBatchNo(String batchNo);
+    /**
+     * 终止计划
+     * @param batchNo
+     */
+    void stopPlanInspectionPlan(String batchNo);
+
 }
 \ No newline at end of file
@@ -171,13 +171,27 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     private void validateInspectionPlanExists(InspectionPlanSaveReqVO req) {
         Set<Long> roadIds = req.getRoadListReqVO().stream().map(InspectionPlanRoadReqVO::getRoadId).collect(Collectors.toSet());
-        QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>();
-        sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
-                .in(InspectionPlanDO::getRoadId, roadIds)
-                .le(InspectionPlanDO::getBeginTime, req.getEndTime())      // start_time <= endTime
-                .ge(InspectionPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
+        Long count =0L;
+        //标准计划
+        if(req.getPlanAttr().equals(1)){
+            QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>();
+            sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
+                    .in(InspectionPlanDO::getRoadId, roadIds)
+                    .le(InspectionPlanDO::getBeginTime, req.getEndTime())      // start_time <= endTime
+                    .ge(InspectionPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
+
+            count = inspectionPlanMapper.selectCount(sql);
+        }else{
+            QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>();
+            sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
+                    .in(InspectionPlanDO::getRoadId, roadIds)
+                    .eq(InspectionPlanDO::getDeleted, 0)
+                    .le(InspectionPlanDO::getBeginTime, req.getEndTime())      // start_time <= endTime
+                    .ge(InspectionPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
+
+            count = inspectionPlanMapper.selectCount(sql);
+        }
-        Long count = inspectionPlanMapper.selectCount(sql);
         if (count > 0) {
             throw exception(INSPECTION_PLAN_EXISTS);
         }
@@ -202,9 +216,20 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Override
     public void deleteInspectionPlanByBatchNo(String batchNo) {
+        InspectionPlanDO inspectionPlanDO = inspectionPlanMapper.selectOne(InspectionPlanDO::getBatchNo, batchNo);
+        if(inspectionPlanDO !=null && inspectionPlanDO.getPlanFinishNum() >0){
+            throw exception(INSPECTION_PLAN_NOT_ALLOW_DELETE);
+        }
         inspectionPlanMapper.deleteByBatchNo(batchNo);
         inspectionPlanDetailMapper.deleteByBatchNo(batchNo);
         inspectionPlanRoleMapper.deleteByBatchNo(batchNo);
     }
+    @Override
+    public void stopPlanInspectionPlan(String batchNo) {
+        inspectionPlanMapper.delete(InspectionPlanDO::getBatchNo, batchNo);
+        inspectionPlanDetailMapper.delete(InspectionPlanDetailDO::getBatchNo,batchNo);
+        inspectionPlanRoleMapper.delete(InspectionPlanRoleDO::getBatchNo, batchNo);
+    }
+
 }
 \ No newline at end of file
@@ -52,6 +52,7 @@ public class PlanRateServiceImpl implements PlanRateService {
         planRate.setStdPlan(createReqVO.getStdPlan());
         planRate.setBusiLine(createReqVO.getBusiLine());
         planRate.setPlanTypeId(createReqVO.getPlanTypeId());
+        planRate.setType(createReqVO.getType());
         planRate.setCreator(userName);
         planRate.setCreateTime(now);
         planRate.setUpdater(userName);