From 7b7a9620f5a44db76e6c556f1330fbdd3809d09a Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Sat, 23 Apr 2022 14:21:42 +0800
Subject: [PATCH] =?UTF-8?q?message:=20=E5=AE=8C=E5=96=84=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=BB=91=E5=AE=9A=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../axis/dao/PowerKernelHouseholdDao.java     |  3 +-
 .../impl/PowerKernelHouseholdServiceImpl.java | 30 ++++++++++++-------
 .../poweraxis/PowerKernelHouseholdDao.xml     | 22 +++++++++-----
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
index 146d606..b3bd63a 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
@@ -31,5 +31,6 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
 
     long getListTotal(PowerKernelListPostitionFormDTO form);
 
-    int queryRepeatHouseId(PowerKernelHouseholdEntity entity);
+
+    List<String> queryHouseIdList(String[] houseIdList, String customerId,String axisStructId);
 }
\ No newline at end of file
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
index 98da315..b48f4bf 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
@@ -144,26 +144,38 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
     @Override
     public void bind(PowerKernelHouseFormDTO form) {
         String customerId = loginUserUtil.getLoginUserCustomerId();
+
+        // 查询出重复的houseId
+        List<String> idList = baseDao.queryHouseIdList(form.getHouseIdList(), form.getAxisStructId(), customerId);
+        // 将idList转换为Set集合进行去重
+        Set<String> setIdList = new HashSet<>();
+        for (String id : idList) {
+            setIdList.add(id);
+        }
+        // 将前端发送的houseId放入Set集合
         Set<String> houseIds = new HashSet<>();
-        Collections.addAll(houseIds,form.getHouseIdList());
+        Collections.addAll(houseIds, form.getHouseIdList());
+        // 去重
+        houseIds.removeAll(setIdList);
+
         Result<List<HouseInfoDTO>> listResult = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId);
-        if(!listResult.success()){
-            return ;
+        if (!listResult.success()) {
+            return;
         }
         List<HouseInfoDTO> houseList = listResult.getData();
         List<PowerKernelHouseholdEntity> list = Lists.newArrayList();
         PowerKernelHouseholdEntity entity;
 
-        for(HouseInfoDTO houseInfo : houseList){
+        for (HouseInfoDTO houseInfo : houseList) {
             Result<IcHouseDTO> icHouseDTOResult = govOrgOpenFeignClient.get(houseInfo.getHomeId());
-            if(!icHouseDTOResult.success()){
-                continue ;
+            if (!icHouseDTOResult.success()) {
+                continue;
             }
             IcHouseDTO houseDto = icHouseDTOResult.getData();
             entity = new PowerKernelHouseholdEntity();
             entity.setHouseId(houseInfo.getHomeId());
 
-            if(!org.springframework.util.StringUtils.isEmpty(houseInfo.getBuildingLatitude()) && !org.springframework.util.StringUtils.isEmpty(houseInfo.getBuildingLongitude())){
+            if (!org.springframework.util.StringUtils.isEmpty(houseInfo.getBuildingLatitude()) && !org.springframework.util.StringUtils.isEmpty(houseInfo.getBuildingLongitude())) {
                 entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude()));
                 entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude()));
             } else {
@@ -178,9 +190,7 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
             entity.setOwnerName(houseDto.getOwnerName());
 
             entity.setStructReferenceId(form.getAxisStructId());
-            if(baseDao.queryRepeatHouseId(entity) > NumConstant.ZERO){
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "只允许绑定一次");
-            }
+
             powerKernelHouseholdService.insert(entity);
         }
     }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
index d10af68..de269cf 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
@@ -71,15 +71,23 @@
 	        limit
                 #{pageNo},#{pageSize}
     </select>
-    <select id="queryRepeatHouseId" resultType="java.lang.Integer">
+    <select id="queryHouseIdList" resultType="java.lang.String">
         SELECT
-            count(*)
+            HOUSE_ID
         FROM
-            pli_power_kernel_household
-        WHERE
-            STRUCT_REFERENCE_ID = #{structReferenceId}
-	    AND
-	        HOUSE_ID = #{houseId}
+	        pli_power_kernel_household
+	    <where>
+            house_id in
+            <foreach collection="houseIdList" item="houseId" open="(" close=")" separator=",">
+                #{houseId}
+            </foreach>
+            AND
+                STRUCT_REFERENCE_ID = #{axisStructId}
+            AND
+                customer_id = #{customerId}
+            AND
+                del_flag = '0'
+        </where>
     </select>