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> 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 { List getPlans(List 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 imp return re; } + @Override + public boolean checkName(String name) { + LambdaQueryWrapper uw = new LambdaQueryWrapper<>(); + uw.eq(PlanEntity::getName,name); + uw.eq(PlanEntity::getIsDeleted,0); + List 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 { throw new ServiceException("获取值班班组长失败!"); }); - - //防止多次创建巡检任务 - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(ImsDutyRecEntity::getDutyId,recDTO.getDutyId()); - wrapper.isNotNull(ImsDutyRecEntity::getInspectTaskId); - List list=this.list(wrapper); - if(list!=null && !list.isEmpty()){ - throw new ServiceException("接班巡检任务已创建,不能多次提交!"); - } - // 新建巡检计划并获取巡检任务Id PlanVO planVO = new PlanVO(); planVO.setRouteId(recDTO.getRouteId());