From 8d6cb22112a06d57d67024998396c6150c0787da Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 14:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9=20BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcPointNucleicMonitoringController.java        |  3 ++-
 .../com/epmet/dao/IcPointNucleicMonitoringDao.java |  2 ++
 .../impl/IcPointNucleicMonitoringServiceImpl.java  | 14 ++++++++++++++
 .../mapper/IcPointNucleicMonitoringDao.xml         |  8 ++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
index d9d3726757..291479ea96 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
@@ -91,9 +91,10 @@ public class IcPointNucleicMonitoringController {
 
     @NoRepeatSubmit
     @PutMapping
-    public Result update(@RequestBody IcPointNucleicMonitoringDTO dto){
+    public Result update(@RequestBody IcPointNucleicMonitoringDTO dto, @LoginUser TokenDto tokenDto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
         icPointNucleicMonitoringService.update(dto);
         return new Result();
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
index bfeaa9c34a..5dcc3fad6f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
@@ -7,6 +7,7 @@ import com.epmet.dto.form.PointHSYMFormDTO;
 import com.epmet.dto.result.MapInfoResultDTO;
 import com.epmet.entity.IcPointNucleicMonitoringEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,7 @@ public interface IcPointNucleicMonitoringDao extends BaseDao<IcPointNucleicMonit
      * @return
      */
     List<String> getAllAddressName();
+    List<String> getAllAddressNameNoCurrent(@Param("id") String id);
 
     /**
      * 条件查询
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
index 4987d470f2..98cc32d68f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
@@ -147,6 +147,20 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPoint
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPointNucleicMonitoringDTO dto) {
+        // 获取所有地点名称
+        List<String> addressList = baseDao.getAllAddressNameNoCurrent(dto.getId());
+        // 校验数据库是否存在该地点名称
+        if (addressList.contains(dto.getName())){
+            throw new RenException("该监测点名称已存在，请重新输入");
+        }
+        if(StringUtils.isNotBlank(dto.getOrgName())){
+            // 赋值pid  pids
+            OrgInfoPointFormDTO formDTO = ConvertUtils.sourceToTarget(dto, OrgInfoPointFormDTO.class);
+            Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO);
+            CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
+            dto.setPid(communityInfoResultDTO.getPid());
+            dto.setPids(communityInfoResultDTO.getPids());
+        }
         IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class);
         updateById(entity);
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
index 23ea0af5d8..d55f4fddce 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
@@ -31,6 +31,14 @@
         where DEL_FLAG = 0
     </select>
 
+    <select id="getAllAddressNameNoCurrent" resultType="java.lang.String">
+        select
+        NAME
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+        and ID != #{id}
+    </select>
+
     <select id="getPhrasePage" resultType="com.epmet.dto.IcPointNucleicMonitoringDTO">
         select
         ID,