完善导出

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactUserHouseController.java

@@ -34,6 +34,14 @@ public class FactUserHouseController {
         return new Result<PageData<FactUserHouseResultDTO>>().ok(page);
     }
 
+    /**
+     * 合计
+     *
+     * @param params
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.stats.result.FactUserHouseResultDTO>
+     * @author zhy
+     * @date 2022/5/31 9:48
+     */
     @RequestMapping("total")
     public Result<FactUserHouseResultDTO> total(@RequestParam Map<String, Object> params) {
         FactUserHouseResultDTO dto = factUserHouseService.total(params);
@@ -46,12 +54,28 @@ public class FactUserHouseController {
         ExcelUtils.exportExcelToTarget(response, null, list, FactUserHouseExcel.class);
     }
 
+    /**
+     * 统计网格纬度
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/5/31 9:48
+     */
     @PostMapping("userHouseStatGrid")
     public Result userHouseStatGrid(@RequestBody FactUserHouseFormDTO formDTO) {
         factUserHouseService.statGrid(formDTO);
         return new Result();
     }
 
+    /**
+     * 统计组织纬度
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/5/31 9:48
+     */
     @PostMapping("userHouseStatAgency")
     public Result userHouseStatAgency(@RequestBody FactUserHouseFormDTO formDTO) {
         factUserHouseService.statAgency(formDTO);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/excel/FactUserHouseExcel.java

@@ -14,23 +14,11 @@ import java.util.Date;
 @Data
 public class FactUserHouseExcel {
 
-    @Excel(name = "主键，customer_id+AGENCY_ID+date_id只有一条记录")
+    @Excel(name = "日期")
-    private String id;
-
-    @Excel(name = "客户id")
-    private String customerId;
-
-    @Excel(name = "数据更新至：yyyyMMdd; ")
     private String dateId;
 
-    @Excel(name = "组织id")
+    @Excel(name = "组织名称")
-    private String agencyId;
+    private String agencyName;
-
-    @Excel(name = "组织i所属的组织id")
-    private String pid;
-
-    @Excel(name = "组织i所有上级id")
-    private String pids;
 
     @Excel(name = "小区总数")
     private Integer neighbourhoodsCount;
@@ -68,23 +56,4 @@ public class FactUserHouseExcel {
     @Excel(name = "当日修改居民数")
     private Integer userModify;
 
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyUserHouseDailyService.java

@@ -3,6 +3,7 @@ package com.epmet.service.stats;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.FactAgencyUserHouseDailyDTO;
+import com.epmet.dto.stats.FactGridUserHouseDailyDTO;
 import com.epmet.dto.stats.form.FactUserHouseFormDTO;
 import com.epmet.dto.stats.result.FactUserHouseResultDTO;
 import com.epmet.entity.stats.FactAgencyUserHouseDailyEntity;
@@ -48,6 +49,16 @@ public interface FactAgencyUserHouseDailyService extends BaseService<FactAgencyU
      */
     List<FactAgencyUserHouseDailyDTO> list(Map<String, Object> params);
 
+    /**
+     * 查询导出数据
+     *
+     * @param params
+     * @return java.util.List<FactUserHouseResultDTO>
+     * @author generator
+     * @date 2022-05-27
+     */
+    List<FactUserHouseResultDTO> listExport(Map<String, Object> params);
+
     /**
      * 单条查询
      *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGridUserHouseDailyService.java

@@ -48,6 +48,16 @@ public interface FactGridUserHouseDailyService extends BaseService<FactGridUserH
      */
     List<FactGridUserHouseDailyDTO> list(Map<String, Object> params);
 
+    /**
+     * 查询导出数据
+     *
+     * @param params
+     * @return java.util.List<FactUserHouseResultDTO>
+     * @author generator
+     * @date 2022-05-27
+     */
+    List<FactUserHouseResultDTO> listExport(Map<String, Object> params);
+
     /**
      * 单条查询
      *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java

@@ -48,6 +48,7 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<FactUserHouseResultDTO> list = baseDao.getTotal(params);
 
+        // 只有当日数据直接展示，否则需要统计时间段内两天差值进行Incr和Modify数据计算
         if (list.size() == NumConstant.ZERO) {
             return null;
         } else if (list.size() == NumConstant.ONE) {
@@ -71,6 +72,11 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
         return ConvertUtils.sourceToTarget(entityList, FactAgencyUserHouseDailyDTO.class);
     }
 
+    @Override
+    public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        return baseDao.listPage(params);
+    }
+
     private QueryWrapper<FactAgencyUserHouseDailyEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java

@@ -48,6 +48,7 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<FactUserHouseResultDTO> list = baseDao.getTotal(params);
 
+        // 只有当日数据直接展示，否则需要统计时间段内两天差值进行Incr和Modify数据计算
         if (list.size() == NumConstant.ZERO) {
             return null;
         } else if (list.size() == NumConstant.ONE) {
@@ -71,6 +72,11 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
         return ConvertUtils.sourceToTarget(entityList, FactGridUserHouseDailyDTO.class);
     }
 
+    @Override
+    public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        return baseDao.listPage(params);
+    }
+
     private QueryWrapper<FactGridUserHouseDailyEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
         String dateId = (String) params.get("dateId");

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java

@@ -71,6 +71,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
     @Override
     public FactUserHouseResultDTO total(Map<String, Object> params) {
         FactUserHouseResultDTO dto = null;
+        // 不查询时间段默认查询当天
         if (params.containsKey("startTime") && params.containsKey("endTime")) {
             if (StringUtils.isNotBlank(params.get("startTime").toString()) && StringUtils.isNotBlank(params.get("endTime").toString())) {
                 params.put("dateId", StringUtils.EMPTY);
@@ -80,6 +81,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
         } else {
             params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
         }
+        // 网格纬度查询网格统计表，其余纬度查询组织统计表
         if (params.containsKey("level")) {
             if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
                 dto = factGridUserHouseDailyService.getTotal(params);
@@ -95,9 +97,9 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
         List<FactUserHouseResultDTO> list = new ArrayList<>();
         if (params.containsKey("level")) {
             if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString()) || OrgLevelEnum.COMMUNITY.getCode().equals(params.get("level").toString())) {
-                list = ConvertUtils.sourceToTarget(factGridUserHouseDailyService.list(params), FactUserHouseResultDTO.class);
+                list = factGridUserHouseDailyService.listExport(params);
             } else {
-                list = ConvertUtils.sourceToTarget(factAgencyUserHouseDailyService.list(params), FactUserHouseResultDTO.class);
+                list = factAgencyUserHouseDailyService.listExport(params);
             }
         }
         return list;
@@ -111,8 +113,10 @@ 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);
@@ -173,8 +177,10 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
             return;
         }
 
+        // 先删除历史
         factAgencyUserHouseDailyService.deleteByDateId(formDTO);
 
+        // 使用机构表左关联，对不同纬度的机构进行分组统计
         formDTO.setLevel("community");
         List<FactUserHouseResultDTO> commList = factGridUserHouseDailyService.statAgency(formDTO);
         if (!commList.isEmpty()) {