From 4b0c913729030b2395c79f78edbe90fb00705d56 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 31 May 2021 14:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/DemoController.java   | 13 +++++++++----
 .../extract/FactAgencyGovernDailyDao.java           | 10 ++++++++++
 .../impl/FactAgencyGovernDailyServiceImpl.java      |  8 ++++++++
 .../extract/FactAgencyGovernDailyDao.xml            |  7 ++++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index a8baf89b38..108f82d575 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -38,10 +38,7 @@ import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
 import com.epmet.service.StatsPartyMemberVanguardService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.*;
-import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactGroupActDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.*;
 import com.epmet.service.evaluationindex.screen.*;
@@ -120,6 +117,8 @@ public class DemoController {
     private FactGroupActDailyService factGroupActDailyService;
     @Autowired
     private FactGridGovernDailyService factGridGovernDailyService;
+    @Autowired
+    private FactAgencyGovernDailyService factAgencyGovernDailyService;
 
     @GetMapping("testAlarm")
     public void testAlarm() {
@@ -924,4 +923,10 @@ public class DemoController {
         factGridGovernDailyService.extractFactGridGovernDaily(fromDTO);
         return new Result();
     }
+    @PostMapping("extractFactAgencyGovernDaily")
+    public Result extractFactAgencyGovernDaily(@RequestBody ExtractFactGridGovernDailyFromDTO fromDTO){
+        factAgencyGovernDailyService.extractFactAgencyGovernDaily(fromDTO.getCustomerId(), fromDTO.getDateId());
+        return new Result();
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
index b88d897543..2671d89c4e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao.evaluationindex.extract;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 组织的治理指数，按天统计
@@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FactAgencyGovernDailyDao extends BaseDao<FactAgencyGovernDailyEntity> {
+	/**
+	 * 删除数据
+	 * @author zhaoqifeng
+	 * @date 2021/5/31 14:47
+	 * @param customerId
+	 * @param dateId
+	 * @return int
+	 */
+	int deleteAgencyGovernDailyData(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("deleteSize") Integer deleteSize);
 	
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
index 82e599ff4b..1fbabc764b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -291,6 +291,14 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 				}
 			});
 		}
+		if (CollectionUtils.isNotEmpty(agencyGovernDailyList)) {
+			int deleteNum;
+			do {
+				deleteNum = baseDao.deleteAgencyGovernDailyData(customerId, dateId, IndexCalConstant.DELETE_SIZE);
+			} while (deleteNum != NumConstant.ZERO);
+			//删除旧数据
+			insertBatch(agencyGovernDailyList);
+		}
 	}
 
 	private FactAgencyGovernDailyEntity initEntity(DimAgencyDTO agency, String dateId) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
index 7b4aa4c504..e8d12dd708 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
@@ -4,5 +4,10 @@
 <mapper namespace="com.epmet.dao.evaluationindex.extract.FactAgencyGovernDailyDao">
 
 
-
+    <delete id="deleteAgencyGovernDailyData">
+        delete from fact_agency_govern_daily
+        where CUSTOMER_ID = #{customerId}
+        AND DATE_ID = #{dateId}
+        limit #{deleteSize}
+    </delete>
 </mapper>
\ No newline at end of file