From bdc99114b742bd7ebd67b4df3a71efa51d30c57f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 13 Jan 2022 09:13:12 +0800
Subject: [PATCH] =?UTF-8?q?groupAgencyDaily=E6=96=B9=E6=B3=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/StatsGroupServiceImpl.java   |  9 +++++++--
 .../service/stats/FactGroupAgencyDailyService.java  |  2 +-
 .../stats/impl/FactGroupAgencyDailyServiceImpl.java | 13 ++++++++-----
 .../stats/impl/FactGroupGridDailyServiceImpl.java   |  4 ++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
index d15122b107..084a3ed84c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@@ -135,10 +135,15 @@ public class StatsGroupServiceImpl implements StatsGroupService {
             if (customerIds.size() != NumConstant.ZERO) {
                 DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
                 customerIds.forEach(customerId -> {
+                    Boolean status = true;
                     try {
                         List<DimAgencyDTO> customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId);
-                        List<AgencyGroupDailyResultDTO> agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId);
-                        factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily, customerId);
+                        List<List<DimAgencyDTO>> partition = ListUtils.partition(customerAgencyInfos, NumConstant.ONE_HUNDRED);
+                        for (List<DimAgencyDTO> p : partition) {
+                            List<AgencyGroupDailyResultDTO> agencyGroupDaily = this.getAgencyGroupDaily(p, dimIdBean, customerId);
+                            factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily, customerId,status);
+                            status = false;
+                        }
                     } catch (Exception e) {
                         log.error(String.format(GroupConstant.STATS_FAILED_AGENCY_DAILY, customerId, LocalDate.now(), e));
                     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java
index 812c2c73da..23b34b22af 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java
@@ -101,7 +101,7 @@ public interface FactGroupAgencyDailyService extends BaseService<FactGroupAgency
      * @param agencyList
      * @author zxc
      */
-    void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId);
+    void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId,Boolean status);
 
     /**
      * @param
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java
index 306849f76e..b822dcaaa0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java
@@ -113,12 +113,15 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAg
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId) {
+    public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId,Boolean status) {
         if (!CollectionUtils.isEmpty(agencyList)){
-            Integer delNum;
-            do {
-                delNum = baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
-            }while (delNum > NumConstant.ZERO && delNum == NumConstant.ONE_THOUSAND);
+            // true 为当前客户第一回进入,需要删除历史数据
+            if (status){
+                Integer delNum;
+                do {
+                    delNum = baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
+                }while (delNum > NumConstant.ZERO && delNum == NumConstant.ONE_THOUSAND);
+            }
             List<List<AgencyGroupDailyResultDTO>> partition = ListUtils.partition(agencyList, NumConstant.ONE_HUNDRED);
             partition.forEach(p -> {
                 baseDao.insertGroupAgencyDaily(p);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupGridDailyServiceImpl.java
index 85902dd39f..993428d34f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupGridDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupGridDailyServiceImpl.java
@@ -120,8 +120,8 @@ public class FactGroupGridDailyServiceImpl extends BaseServiceImpl<FactGroupGrid
             return;
         }
         String dateId = formDto.get(NumConstant.ZERO).getDateId();
-        // true 为当前客户第一回进入
-        if (!status){
+        // true 为当前客户第一回进入,需要删除历史数据
+        if (status){
             Integer delNum;
             do {
                 delNum = baseDao.deleteInsertDateId(dateId,customerId);