增加防火监督检查计划删除后端校验

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -1986,6 +1986,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 pageParam.put("governUserId", jcsUserId);
             }
         }
+        pageParam.put("bizType", bizType);
 
         Page page = new Page(pageParam.getParamPageCurrent(), pageParam.getParamPageSize());
         IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(page, (Map<String, Object>) pageParam);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanController.java

@@ -127,7 +127,7 @@ public class PlanController extends AbstractBaseController {
             return CommonResponseUtil.success();
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure("删除巡检计划失败");
+            return CommonResponseUtil.failure("删除巡检计划失败" + ":" + e.getMessage());
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPlanDao.java

@@ -40,5 +40,7 @@ public interface IPlanDao extends BaseDao<Plan, Long> {
     @Query(value = "select * from p_plan where original_id in (?1) and is_delete = 0", nativeQuery = true)
     List<Plan> findByOriginalIds(List<String> originalIds);
 
-
+    @Query(value = "select count(*) from p_plan where is_delete = 0 and id in (?1) and status != (?2)", nativeQuery =
+            true)
+    int countNotDeletable(List<Long> ids, int status);
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -362,11 +362,18 @@ public class PlanServiceImpl implements IPlanService {
 
     @Override
     @Transactional
-    public void delPlanById(String[] param) {
-        List<Long> ids = new ArrayList<Long>();
+    public void delPlanById(String[] param) throws Exception {
+        List<Long> ids = new ArrayList<>();
         for (int i = 0; i < param.length; i++) {
             ids.add(Long.parseLong(param[i]));
         }
+        if (ValidationUtil.isEmpty(ids)) {
+            throw new Exception("参数为空");
+        }
+        // 校验是否可以删除（PlanStatusEnum.DRAFT：草稿状态可删除）
+        if (planDao.countNotDeletable(ids, PlanStatusEnum.DRAFT.getValue()) > 0) {
+            throw new Exception("非草稿状态计划不能删除");
+        }
         planDao.updatePlanDel(ids);
         // 删除对应该计划今天往后的所有计划执行信息
         Calendar calendar = Calendar.getInstance();

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanService.java

@@ -28,7 +28,7 @@ public interface IPlanService {
 	/**
 	 * 巡检计划删除
 	 */
-	void delPlanById(String[] param);
+	void delPlanById(String[] param) throws Exception;
 
 	/**
 	 * 巡检计划另存