From ed3ec7c483dbc93398297f6d866c6457162fe1b1 Mon Sep 17 00:00:00 2001
From: walton <1239357677@qq.com>
Date: Tue, 8 Oct 2024 08:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=A4=E7=8F=AD=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E8=AE=A1=E5=88=92=E5=A4=9A=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hnac/hzinfo/inspect/plan/feign/InspectPlanClient.java   |  4 ++++
 .../com/hnac/hzinfo/inspect/plan/service/IPlanService.java  |  2 ++
 .../hzinfo/inspect/plan/service/impl/PlanServiceImpl.java   | 13 +++++++++++++
 .../duty/service/impl/ImsDutyRecServiceImpl.java            | 10 ----------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/feign/InspectPlanClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/feign/InspectPlanClient.java
index 0295e17..ef4fc80 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/feign/InspectPlanClient.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/feign/InspectPlanClient.java
@@ -24,6 +24,10 @@ public class InspectPlanClient implements IInspectPlanClient {
 	@PostMapping("/addPlanAndChecked")
 	@Override
 	public R<List<Long>> addPlanAndChecked(PlanVO plan) {
+		boolean flag=planService.checkName(plan.getName());
+		if(flag) {
+			return R.fail("交班巡检计划已存在");
+		}
 		return R.data(planService.addAndChecked(plan));
 	}
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java
index bf491d2..2eafcfd 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java
@@ -61,4 +61,6 @@ public interface IPlanService extends BaseService<PlanEntity> {
 	List<PlanOfflineVO> getPlans(List<Long> planIds);
 
 	Boolean revoke(Long planId);
+
+	boolean checkName(String name);
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java
index b060ace..82b873a 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java
@@ -1,5 +1,6 @@
 package com.hnac.hzinfo.inspect.plan.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.hnac.hzinfo.inspect.plan.vo.PlanOfflineVO;
 import org.springblade.system.feign.ISysClient;
 import com.alibaba.fastjson.JSON;
@@ -123,6 +124,18 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 		return re;
 	}
 
+	@Override
+	public boolean checkName(String name) {
+		LambdaQueryWrapper<PlanEntity> uw = new LambdaQueryWrapper<>();
+		uw.eq(PlanEntity::getName,name);
+		uw.eq(PlanEntity::getIsDeleted,0);
+		List<PlanEntity> list=this.list(uw);
+		if(list!=null && !list.isEmpty()){
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * 保存巡检计划
 	 */
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
index 8ccab7c..4f59b65 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
@@ -208,16 +208,6 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         Assert.isTrue(Func.isNotEmpty(managerId),() -> {
             throw new ServiceException("获取值班班组长失败！");
         });
-
-        //防止多次创建巡检任务
-        LambdaQueryWrapper<ImsDutyRecEntity> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(ImsDutyRecEntity::getDutyId,recDTO.getDutyId());
-        wrapper.isNotNull(ImsDutyRecEntity::getInspectTaskId);
-        List<ImsDutyRecEntity> list=this.list(wrapper);
-        if(list!=null && !list.isEmpty()){
-            throw new ServiceException("接班巡检任务已创建,不能多次提交！");
-        }
-
         // 新建巡检计划并获取巡检任务Id
         PlanVO planVO = new PlanVO();
         planVO.setRouteId(recDTO.getRouteId());