Merge remote-tracking branch 'origin/develop' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java

@@ -64,6 +64,6 @@ public interface FactGroupAgencyDailyDao extends BaseDao<FactGroupAgencyDailyEnt
      * @Description 删除当天已存在数据
      * @author zxc
      */
-    void deleteInsertAgencyDailyByDateId(@Param("dateId") String dateId, @Param("customerId") String customerId);
+    Integer deleteInsertAgencyDailyByDateId(@Param("dateId") String dateId, @Param("customerId") String customerId);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java

@@ -33,9 +33,11 @@ import com.epmet.dto.group.result.AgencyGroupMonthlyResultDTO;
 import com.epmet.dto.stats.FactGroupAgencyDailyDTO;
 import com.epmet.entity.stats.FactGroupAgencyDailyEntity;
 import com.epmet.service.stats.FactGroupAgencyDailyService;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -112,11 +114,16 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAg
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId) {
-        if (agencyList.size() != NumConstant.ZERO){
+        if (!CollectionUtils.isEmpty(agencyList)){
-            baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
+            Integer delNum;
-            baseDao.insertGroupAgencyDaily(agencyList);
+            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);
+            });
         }
-
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml

@@ -122,6 +122,7 @@
         WHERE
             date_id = #{dateId}
             AND customer_id = #{customerId}
+        LIMIT 1000
     </delete>
 
 </mapper>