From 0b03d78a9110e84159019b3acf6c59071f78ca00 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sun, 26 Sep 2021 10:15:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=20=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...FactPartyMemberVanguardAgencyDailyDao.java |  7 ++--
 .../FactPartyMemberVanguardGridDailyDao.java  |  5 ++-
 .../StatsPartyMemberVanguardServiceImpl.java  | 37 ++++++++++++++-----
 ...PartyMemberVanguardAgencyDailyService.java |  5 ++-
 ...ctPartyMemberVanguardGridDailyService.java |  5 ++-
 ...yMemberVanguardAgencyDailyServiceImpl.java |  7 ++--
 ...rtyMemberVanguardGridDailyServiceImpl.java |  7 ++--
 .../FactPartyMemberVanguardAgencyDailyDao.xml |  3 +-
 .../FactPartyMemberVanguardGridDailyDao.xml   |  3 +-
 9 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java
index 812935ef6e..d26edb4af4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java
@@ -37,8 +37,9 @@ public interface FactPartyMemberVanguardAgencyDailyDao extends BaseDao<FactParty
 	 * @date 2021/5/17 17:19
 	 * @param customerId
 	 * @param dateId
+	 * @param limit
 	 * @return int
 	 */
-	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId")  String dateId);
-	
-}
\ No newline at end of file
+	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId") String dateId, Integer limit);
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java
index 310bcabdef..9d05497095 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java
@@ -36,7 +36,8 @@ public interface FactPartyMemberVanguardGridDailyDao extends BaseDao<FactPartyMe
 	 * @date 2021/5/17 17:19
 	 * @param customerId
 	 * @param dateId
+	 * @param limit
 	 * @return int
 	 */
-	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId")  String dateId);
-}
\ No newline at end of file
+	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId") String dateId, Integer limit);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
index 7147774894..026a52f108 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
@@ -6,7 +6,6 @@ import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.stats.DimAgencyDTO;
-import com.epmet.dto.stats.DimGridDTO;
 import com.epmet.entity.stats.DimGridEntity;
 import com.epmet.entity.stats.FactPartyMemberVanguardAgencyDailyEntity;
 import com.epmet.entity.stats.FactPartyMemberVanguardGridDailyEntity;
@@ -16,6 +15,7 @@ import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -191,10 +191,20 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 					}
 				});
 			}
-			//删除旧数据
-			factPartyMemberVanguardAgencyDailyService.deleteDailyData(customerId, dimId.getDateId());
-			//批量插入
-			factPartyMemberVanguardAgencyDailyService.insertBatch(vanguardList);
+			//删除旧数据 每次删除1000
+			Integer effectRow;
+			do {
+				effectRow = factPartyMemberVanguardAgencyDailyService.deleteDailyData(customerId, dimId.getDateId(), NumConstant.ONE_THOUSAND);
+			} while (effectRow != null && effectRow > NumConstant.ZERO);
+
+			//批量插入 每次100
+			if (CollectionUtils.isEmpty(vanguardList)) {
+				log.warn("customerAgencyStats insert list is empty,customerId:{},dateId:{}", customerId, dimId.getDateId());
+			}
+
+			ListUtils.partition(vanguardList, NumConstant.ONE_HUNDRED)
+					.forEach(part -> factPartyMemberVanguardAgencyDailyService.insertBatch(part));
+
 		}
 	}
 	/**
@@ -327,10 +337,19 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 					}
 				});
 			}
-			//删除旧数据
-			factPartyMemberVanguardGridDailyService.deleteDailyData(customerId, dimId.getDateId());
-			//批量插入
-			factPartyMemberVanguardGridDailyService.insertBatch(vanguardList);
+
+			//删除旧数据 每次删除1000
+			Integer effectRow;
+			do {
+				effectRow = factPartyMemberVanguardGridDailyService.deleteDailyData(customerId, dimId.getDateId(), NumConstant.ONE_THOUSAND);
+			} while (effectRow != null && effectRow > NumConstant.ZERO);
+
+			//批量插入 每次100
+			if (CollectionUtils.isEmpty(vanguardList)){
+				log.warn("customerGridStats insert list is empty,customerId:{},dateId:{}", customerId, dimId.getDateId());
+			}
+			ListUtils.partition(vanguardList, NumConstant.ONE_HUNDRED)
+					.forEach(part -> factPartyMemberVanguardGridDailyService.insertBatch(part));
 		}
 	}
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java
index 385b615549..1ff31be7cc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java
@@ -99,7 +99,8 @@ public interface FactPartyMemberVanguardAgencyDailyService extends BaseService<F
      * @date 2021/5/17 15:55
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      */
-    void deleteDailyData(String customerId, String dateId);
-}
\ No newline at end of file
+    Integer deleteDailyData(String customerId, String dateId, Integer limit);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java
index bfe7d258ce..6a410fb135 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java
@@ -99,7 +99,8 @@ public interface FactPartyMemberVanguardGridDailyService extends BaseService<Fac
      * @date 2021/5/17 15:55
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      */
-    void deleteDailyData(String customerId, String dateId);
-}
\ No newline at end of file
+    Integer deleteDailyData(String customerId, String dateId, Integer limit);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
index 9c951b7b2f..3d32581b86 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
@@ -105,14 +105,15 @@ public class FactPartyMemberVanguardAgencyDailyServiceImpl extends BaseServiceIm
      *
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      * @author zhaoqifeng
      * @date 2021/5/17 15:55
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteDailyData(String customerId, String dateId) {
-        baseDao.deleteDailyData(customerId, dateId);
+    public Integer deleteDailyData(String customerId, String dateId, Integer limit) {
+        return baseDao.deleteDailyData(customerId, dateId, limit);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java
index 235cf53e23..58be1bd814 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java
@@ -105,14 +105,15 @@ public class FactPartyMemberVanguardGridDailyServiceImpl extends BaseServiceImpl
      *
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      * @author zhaoqifeng
      * @date 2021/5/17 15:55
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteDailyData(String customerId, String dateId) {
-        baseDao.deleteDailyData(customerId, dateId);
+    public Integer deleteDailyData(String customerId, String dateId, Integer limit) {
+        return baseDao.deleteDailyData(customerId, dateId, limit);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml
index f6de9644d1..d900117b82 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml
@@ -34,7 +34,8 @@
     </resultMap>
     <delete id="deleteDailyData">
         delete from fact_party_member_vanguard_agency_daily where customer_id = #{customerId} and DATE_ID = #{dateId}
+        limit #{limit}
     </delete>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml
index 311262a04f..95a527b323 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml
@@ -34,7 +34,8 @@
     </resultMap>
     <delete id="deleteDailyData">
         delete from fact_party_member_vanguard_grid_daily where customer_id = #{customerId} and DATE_ID = #{dateId}
+        limit #{limit}
     </delete>
 
 
-</mapper>
\ No newline at end of file
+</mapper>