From 1eb63292955584eb037a5e6ce87b7bfcadd924f2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 30 May 2022 13:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/stats/FactGridUserHouseDailyDao.java   |  2 ++
 .../com/epmet/service/org/HouseService.java    | 16 ++++++++++++++++
 .../stats/FactGridUserHouseDailyService.java   | 18 ++++++++++++++++++
 .../service/stats/FactUserHouseService.java    | 16 ++++++++++++++++
 .../FactGridUserHouseDailyServiceImpl.java     |  5 +++++
 .../stats/impl/FactUserHouseServiceImpl.java   |  2 ++
 .../epmet/service/user/IcResiUserService.java  |  8 ++++++++
 .../mapper/stats/FactGridUserHouseDailyDao.xml |  8 ++++++++
 8 files changed, 75 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGridUserHouseDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGridUserHouseDailyDao.java
index 346ea6bf40..d6ee4903be 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGridUserHouseDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGridUserHouseDailyDao.java
@@ -21,4 +21,6 @@ public interface FactGridUserHouseDailyDao extends BaseDao<FactGridUserHouseDail
     List<FactUserHouseResultDTO> listPage(Map<String, Object> params);
 
     List<FactUserHouseResultDTO> statAgency(FactUserHouseFormDTO formDTO);
+
+    void deleteByDateId(FactUserHouseFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/HouseService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/HouseService.java
index fa7081cf7c..a174b06c26 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/HouseService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/HouseService.java
@@ -30,8 +30,24 @@ import java.util.List;
  */
 public interface HouseService {
 
+    /**
+     * 房屋统计
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.stats.result.FactUserHouseResultDTO>
+     * @author zhy
+     * @date 2022/5/30 13:33
+     */
     List<FactUserHouseResultDTO> houseStat(FactUserHouseFormDTO formDTO);
 
+    /**
+     * 小区统计
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.stats.result.FactUserHouseResultDTO>
+     * @author zhy
+     * @date 2022/5/30 13:33
+     */
     List<FactUserHouseResultDTO> neighborhoodStat(FactUserHouseFormDTO formDTO);
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGridUserHouseDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGridUserHouseDailyService.java
index bd171008cb..3e63b8c477 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGridUserHouseDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGridUserHouseDailyService.java
@@ -78,5 +78,23 @@ public interface FactGridUserHouseDailyService extends BaseService<FactGridUserH
      */
     void delete(String[] ids);
 
+    /**
+     * 物理删除历史数据
+     *
+     * @param formDTO
+     * @return void
+     * @author zhy
+     * @date 2022/5/30 13:32
+     */
+    void deleteByDateId(FactUserHouseFormDTO formDTO);
+
+    /**
+     * 根据网格统计组织数据
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.stats.result.FactUserHouseResultDTO>
+     * @author zhy
+     * @date 2022/5/30 13:32
+     */
     List<FactUserHouseResultDTO> statAgency(FactUserHouseFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactUserHouseService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactUserHouseService.java
index 6b77221a07..8f3776908b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactUserHouseService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactUserHouseService.java
@@ -36,7 +36,23 @@ public interface FactUserHouseService {
      */
     List<FactUserHouseResultDTO> list(Map<String, Object> params);
 
+    /**
+     * 人房网格数据
+     *
+     * @param formDTO
+     * @return void
+     * @author zhy
+     * @date 2022/5/30 13:31
+     */
     void statGrid(FactUserHouseFormDTO formDTO);
 
+    /**
+     * 人房组织数据
+     *
+     * @param formDTO
+     * @return void
+     * @author zhy
+     * @date 2022/5/30 13:31
+     */
     void statAgency(FactUserHouseFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
index 54878a314e..c2232e4f56 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
@@ -89,6 +89,11 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public void deleteByDateId(FactUserHouseFormDTO formDTO){
+        baseDao.deleteByDateId(formDTO);
+    }
+
     @Override
     public List<FactUserHouseResultDTO> statAgency(FactUserHouseFormDTO formDTO){
         return baseDao.statAgency(formDTO);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
index 47a30955bd..48b82e2065 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
@@ -80,6 +80,8 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
         String dateId = formDTO.getDateId();
         String customerId = formDTO.getCustomerId();
 
+        factGridUserHouseDailyService.deleteByDateId(formDTO);
+
         List<FactUserHouseResultDTO> neiList = houseService.neighborhoodStat(formDTO);
         List<FactUserHouseResultDTO> houseList = houseService.houseStat(formDTO);
         List<FactUserHouseResultDTO> userList = icResiUserService.userStat(formDTO);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/IcResiUserService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/IcResiUserService.java
index 12bc106b65..3f2289edef 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/IcResiUserService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/IcResiUserService.java
@@ -32,6 +32,14 @@ import java.util.List;
  */
 public interface IcResiUserService extends BaseService<IcResiUserEntity> {
 
+    /**
+     * 居民统计
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.stats.result.FactUserHouseResultDTO>
+     * @author zhy
+     * @date 2022/5/30 13:33
+     */
     List<FactUserHouseResultDTO> userStat(FactUserHouseFormDTO formDTO);
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
index 6108a2f5cc..77b9f35449 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
@@ -151,4 +151,12 @@
         </if>
     </select>
 
+    <delete id="deleteByDateId">
+        DELETE
+        FROM
+            fact_agency_user_house_daily
+        WHERE
+            DATE_ID = #{dateId}
+            AND CUSTOMER_ID = #{customerId}
+    </delete>
 </mapper>
\ No newline at end of file