From 7947d17fc7d5c9e3be650bac2eab09c9e93305f8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 14 Jul 2022 17:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4=E8=AF=95?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcStatsResiWarnDao.java    | 2 ++
 .../com/epmet/service/impl/StatsResiWarnServiceImpl.java   | 7 ++++++-
 .../src/main/resources/mapper/IcStatsResiWarnDao.xml       | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
index 3e261b041f..e3c7d35318 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
@@ -87,4 +87,6 @@ public interface IcStatsResiWarnDao extends BaseDao<IcStatsResiWarnEntity> {
     List<IcUserWarnNoticeResultDTO> queryUserWarnNotice(@Param("customerId") String customerId,
                                                         @Param("agencyId") String agencyId,
                                                         @Param("configIds") List<String> configIds);
+
+    int deleteByCustomerIdAndConfigId(@Param("configId") String configId, @Param("customerId")String customerId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
index 13645f9047..cced7c95b1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
@@ -306,7 +306,12 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         //保存数据
         List<IcStatsResiWarnEntity> icStatsResiWarnEntities = new ArrayList<>();
         for (IcResiCategoryWarnConfigDTO item : icResiCategoryWarnConfigDTOList) {
-            icStatsResiWarnDao.delete(new QueryWrapper<IcStatsResiWarnEntity>().lambda().eq(IcStatsResiWarnEntity::getConfigId,item.getId()).eq(IcStatsResiWarnEntity::getCustomerId,customerId));
+            int deleteNum;
+            do {
+                // deleteNum = icStatsResiWarnDao.delete(new QueryWrapper<IcStatsResiWarnEntity>().lambda().eq(IcStatsResiWarnEntity::getConfigId,item.getId())
+                //         .eq(IcStatsResiWarnEntity::getCustomerId,customerId));
+                deleteNum = icStatsResiWarnDao.deleteByCustomerIdAndConfigId(item.getId(),customerId);
+            } while (deleteNum > NumConstant.ZERO);
 
 
             List<IcStatsResiWarnEntity> maps = icStatsResiWarnDao.resiWarn(customerId,item.getTableName(), item.getColumnName());
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
index 24e607f3c7..9efaf62361 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
@@ -206,4 +206,11 @@
                 </foreach>
             )
     </select>
+
+    <delete id="deleteByCustomerIdAndConfigId" parameterType="map">
+        DELETE FROM ic_stats_resi_warn
+       WHERE config_id = #{configId}
+         and customer_id = #{customerId}
+         limit 1000
+    </delete>
 </mapper>