From f241ce0437b157df67ddf35830792925041a8726 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Sat, 23 Apr 2022 11:30:38 +0800
Subject: [PATCH] =?UTF-8?q?message:=20=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PowerAxisDataVisualController.java    |  2 ++
 .../modules/axis/dao/PowerKernelHouseholdDao.java    |  2 ++
 .../axis/service/PowerKernelHouseholdService.java    |  2 ++
 .../service/impl/PowerAxisStructServiceImpl.java     |  3 +--
 .../impl/PowerKernelHouseholdServiceImpl.java        |  6 ++++++
 .../mapper/poweraxis/PowerKernelHouseholdDao.xml     | 12 +++++++++++-
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java
index b98a9c2..7841605 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java
@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
 
 /***
  * 动力主轴相关数据可视化接口
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 4444184..146d606 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
@@ -30,4 +30,6 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
     List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form);
 
     long getListTotal(PowerKernelListPostitionFormDTO form);
+
+    int queryRepeatHouseId(PowerKernelHouseholdEntity entity);
 }
\ 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/PowerKernelHouseholdService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java
index 9f69830..080b8bc 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java
@@ -97,4 +97,6 @@ public interface PowerKernelHouseholdService extends BaseService<PowerKernelHous
     long getListTotal(PowerKernelListPostitionFormDTO form);
 
     void bind(PowerKernelHouseFormDTO form);
+
+
 }
\ 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/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
index 998f71b..0141bd9 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
@@ -100,7 +100,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         this.assembleStruct(entity);
 
         baseDao.insert(entity);
-        insert(entity);
     }
 
     @Override
@@ -262,7 +261,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
 
     @Override
     public PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form) {
-
+        form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         // 查网格党支部数 grid_party
         int gridParty = baseDao.queryGridParty(form);
         // 查楼院党小组数 group_party
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 728aed9..98da315 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
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -175,6 +178,9 @@ 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 d988167..d10af68 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
@@ -29,7 +29,7 @@
         WHERE
 	        STRUCT_REFERENCE_ID = #{axisStructId}
 	    AND
-	        customer_id = #{customerrId}
+	        customer_id = #{customerId}
     </select>
     <select id="getListPosition"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO">
@@ -71,6 +71,16 @@
 	        limit
                 #{pageNo},#{pageSize}
     </select>
+    <select id="queryRepeatHouseId" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            pli_power_kernel_household
+        WHERE
+            STRUCT_REFERENCE_ID = #{structReferenceId}
+	    AND
+	        HOUSE_ID = #{houseId}
+    </select>
 
 
 </mapper>
\ No newline at end of file