增加历史数据删除功能

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);
 }

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);
 
 }

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);
 }

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);
 }

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);

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);

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);
 
 }

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>