From 12312aba4e7c5cf7f7c6a312302fdebc23be0a27 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 25 Jul 2022 13:53:21 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenProjectDataServiceImpl.java    | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

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 27b5255863..004085496a 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,20 +260,11 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         //库中无数据，范围性删除无意义，只是针对在数据库有历史数据的情况下，保证对同一天进行反
         //复采集时数不会重复
         if(!CollectionUtils.isEmpty(meta)){
-            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<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);
+            });
 
             List<List<ScreenProjectDataDTO>> partition = ListUtils.partition(meta, NumConstant.ONE_HUNDRED);
             partition.forEach(part -> {