From 94444eddd9543a8034c8838e2f455cf6d7f57c34 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 25 Jul 2022 11:16:49 +0800
Subject: [PATCH] =?UTF-8?q?screen=5Fproject=5Fdata=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8A=BD=E5=8F=96=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20eventreport=5Fpingyin=E8=A1=A8=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=8F=92=E5=85=A5=E6=94=B9=E6=88=90=E5=8D=95=E6=9D=A1?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenProjectDataDao.java            |  2 ++
 .../impl/ScreenProjectDataServiceImpl.java      | 17 ++++++++++++++---
 .../screen/ScreenProjectDataDao.xml             |  6 ++++++
 .../impl/EventreportPingyinServiceImpl.java     |  8 +++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
index 36a31e24cc..1809319a3c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
@@ -133,4 +133,6 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
      * @Date 2022/3/16 9:48
      */
     void updateHistoryData(CustomerStaffGridDTO dto);
+
+    int getProjectCount(@Param("customerId") String customerId,@Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index f611edf8f7..27b5255863 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -260,10 +260,21 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         //库中无数据，范围性删除无意义，只是针对在数据库有历史数据的情况下，保证对同一天进行反
         //复采集时数不会重复
         if(!CollectionUtils.isEmpty(meta)){
-            int affectedRows = baseDao.deleteByProjectTimeAndCustomerId(customerId,dateId);
-            while (affectedRows > NumConstant.ZERO) {
-                affectedRows = baseDao.deleteByProjectTimeAndCustomerId(customerId, dateId);
+            int count = baseDao.getProjectCount(customerId, dateId);
+            if (meta.size() < count) {
+                //meta的数据量小于表里的数据量，意味着指定部分数据进行重新抽取，只需要删除指定的项目数据即可
+                List<String> projectIds = meta.stream().map(ScreenProjectDataDTO::getProjectId).collect(Collectors.toList());
+                List<List<String>> projectPartition = ListUtils.partition(projectIds, NumConstant.FIFTY);
+                projectPartition.forEach(part -> {
+                    baseDao.deleteByProjectIds(customerId, part);
+                });
+            } else {
+                int affectedRows = baseDao.deleteByProjectTimeAndCustomerId(customerId,dateId);
+                while (affectedRows > NumConstant.ZERO) {
+                    affectedRows = baseDao.deleteByProjectTimeAndCustomerId(customerId, dateId);
+                }
             }
+
             List<List<ScreenProjectDataDTO>> partition = ListUtils.partition(meta, NumConstant.ONE_HUNDRED);
             partition.forEach(part -> {
                 List<ScreenProjectDataEntity> list = ConvertUtils.sourceToTarget(part, ScreenProjectDataEntity.class);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index 68e2d9d27f..64b783c786 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -539,4 +539,10 @@
             AND ORG_ID = #{agencyId}
             AND ORIGIN = 'agency'
     </update>
+    <select id="getProjectCount" resultType="int">
+        select count(ID)
+        from screen_project_data
+        where customer_id = #{customerId}
+        and DATA_END_TIME = #{dateId}
+    </select>
 </mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
index df1d77eca2..fbf68fc8c5 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
@@ -162,7 +162,13 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                 }
             });
         } else {
-            insertBatch(entityList);
+            for (EventreportPingyinEntity entity : entityList) {
+                try {
+                    baseDao.insert(entity);
+                } catch (Exception e) {
+                    log.error(e.toString());
+                }
+            }
         }