完善页面查询

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

@@ -34,6 +34,12 @@ public class FactUserHouseController {
         return new Result<PageData<FactUserHouseResultDTO>>().ok(page);
     }
 
+    @RequestMapping("total")
+    public Result<FactUserHouseResultDTO> total(@RequestParam Map<String, Object> params) {
+        FactUserHouseResultDTO dto = factUserHouseService.total(params);
+        return new Result<FactUserHouseResultDTO>().ok(dto);
+    }
+
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<FactUserHouseResultDTO> list = factUserHouseService.list(params);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyUserHouseDailyDao.java

@@ -20,5 +20,7 @@ public interface FactAgencyUserHouseDailyDao extends BaseDao<FactAgencyUserHouse
 
     List<FactUserHouseResultDTO> listPage(Map<String, Object> params);
 
+    FactUserHouseResultDTO getTotal(Map<String, Object> params);
+
     void deleteByDateId(FactUserHouseFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGridUserHouseDailyDao.java

@@ -20,6 +20,8 @@ public interface FactGridUserHouseDailyDao extends BaseDao<FactGridUserHouseDail
 
     List<FactUserHouseResultDTO> listPage(Map<String, Object> params);
 
+    FactUserHouseResultDTO getTotal(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/stats/FactAgencyUserHouseDailyService.java

@@ -28,6 +28,16 @@ public interface FactAgencyUserHouseDailyService extends BaseService<FactAgencyU
      */
     PageData<FactUserHouseResultDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页合计
+     *
+     * @param params
+     * @return PageData<FactAgencyUserHouseDailyDTO>
+     * @author generator
+     * @date 2022-05-27
+     */
+    FactUserHouseResultDTO getTotal(Map<String, Object> params);
+
     /**
      * 默认查询
      *

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

@@ -28,6 +28,16 @@ public interface FactGridUserHouseDailyService extends BaseService<FactGridUserH
      */
     PageData<FactUserHouseResultDTO> page(Map<String, Object> params);
 
+    /**
+     * 页面合计
+     *
+     * @param params
+     * @return PageData<FactGridUserHouseDailyDTO>
+     * @author generator
+     * @date 2022-05-27
+     */
+    FactUserHouseResultDTO getTotal(Map<String, Object> params);
+
     /**
      * 默认查询
      *

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

@@ -26,6 +26,16 @@ public interface FactUserHouseService {
      */
     PageData<FactUserHouseResultDTO> page(Map<String, Object> params);
 
+    /**
+     * 页面合计
+     *
+     * @param params
+     * @return PageData<FactAgencyUserHouseDailyDTO>
+     * @author generator
+     * @date 2022-05-27
+     */
+    FactUserHouseResultDTO total(Map<String, Object> params);
+
     /**
      * 默认查询
      *

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

@@ -43,6 +43,12 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public FactUserHouseResultDTO getTotal(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        return baseDao.getTotal(params);
+    }
+
     @Override
     public List<FactAgencyUserHouseDailyDTO> list(Map<String, Object> params) {
         List<FactAgencyUserHouseDailyEntity> entityList = baseDao.selectList(getWrapper(params));

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

@@ -42,6 +42,12 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public FactUserHouseResultDTO getTotal(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        return baseDao.getTotal(params);
+    }
+
     @Override
     public List<FactGridUserHouseDailyDTO> list(Map<String, Object> params) {
         List<FactGridUserHouseDailyEntity> entityList = baseDao.selectList(getWrapper(params));

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

@@ -59,6 +59,19 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
         return page;
     }
 
+    @Override
+    public FactUserHouseResultDTO total(Map<String, Object> params) {
+        FactUserHouseResultDTO dto = null;
+        if (params.containsKey("level")) {
+            if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
+                dto = factGridUserHouseDailyService.getTotal(params);
+            } else {
+                dto = factAgencyUserHouseDailyService.getTotal(params);
+            }
+        }
+        return dto;
+    }
+
     @Override
     public List<FactUserHouseResultDTO> list(Map<String, Object> params) {
         List<FactUserHouseResultDTO> list = new ArrayList<>();

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml

@@ -53,23 +53,24 @@
             AND a.CUSTOMER_ID = #{customerId}
             AND d.CUSTOMER_ID = #{customerId}
         </if>
-        <if test="agencyId != null and agencyId != ''">
-            AND a.AGENCY_ID = #{agencyId}
-        </if>
         <if test="dateId != null and dateId != ''">
             AND a.DATE_ID = #{dateId}
         </if>
         <if test="level == 'street'">
             AND a.LEVEL = 'community'
+            AND a.PID = #{agencyId}
         </if>
         <if test="level == 'district'">
             AND a.LEVEL = 'street'
+            AND a.PID = #{agencyId}
         </if>
         <if test="level == 'city'">
             AND a.LEVEL = 'district'
+            AND a.PID = #{agencyId}
         </if>
         <if test="level == 'province'">
             AND a.LEVEL = 'city'
+            AND a.PID = #{agencyId}
         </if>
         <if test="startTime != null and startTime != ''">
             AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
@@ -81,6 +82,42 @@
         a.AGENCY_ID
     </select>
 
+    <select id="getTotal" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
+        SELECT
+        d.AGENCY_NAME AS AGENCY_NAME,
+        sum( NEIGHBOURHOODS_COUNT ) AS NEIGHBOURHOODS_COUNT,
+        sum( HOUSE_COUNT ) AS HOUSE_COUNT,
+        sum( HOUSE_SELF_COUNT ) AS HOUSE_SELF_COUNT,
+        sum( HOUSE_LEASE_COUNT ) AS HOUSE_LEASE_COUNT,
+        sum( HOUSE_IDLE_COUNT ) AS HOUSE_IDLE_COUNT,
+        sum( USER_COUNT ) AS USER_COUNT,
+        sum( USER_RESI_COUNT ) AS USER_RESI_COUNT,
+        sum( USER_FLOAT_COUNT ) AS USER_FLOAT_COUNT,
+        sum( HOUSE_INCR ) AS HOUSE_INCR,
+        sum( HOUSE_MODIFY ) AS HOUSE_MODIFY,
+        sum( USER_INCR ) AS USER_INCR,
+        sum( USER_MODIFY ) AS USER_MODIFY
+        FROM
+        fact_agency_user_house_daily a
+        LEFT JOIN dim_agency d ON d.id = a.AGENCY_ID
+        <if test="customerId != null and customerId != ''">
+            AND a.CUSTOMER_ID = #{customerId}
+            AND d.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test="agencyId != null and agencyId != ''">
+            AND a.AGENCY_ID = #{agencyId}
+        </if>
+        <if test="dateId != null and dateId != ''">
+            AND a.DATE_ID = #{dateId}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
+        </if>
+    </select>
+
     <delete id="deleteByDateId">
         DELETE
         FROM

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml

@@ -52,9 +52,12 @@
             AND g.CUSTOMER_ID = #{customerId}
             AND d.CUSTOMER_ID = #{customerId}
         </if>
-        <if test="agencyId != null and agencyId != ''">
+        <if test="level == 'grid'">
             AND d.GRID_ID = #{agencyId}
         </if>
+        <if test="level == 'community'">
+            AND d.PID = #{agencyId}
+        </if>
         <if test="dateId != null and dateId != ''">
             AND d.DATE_ID = #{dateId}
         </if>
@@ -68,6 +71,43 @@
         GRID_ID
     </select>
 
+    <select id="getTotal" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
+        SELECT
+        g.GRID_NAME AS AGENCY_NAME,
+        sum( NEIGHBOURHOODS_COUNT ) AS NEIGHBOURHOODS_COUNT,
+        sum( HOUSE_COUNT ) AS HOUSE_COUNT,
+        sum( HOUSE_SELF_COUNT ) AS HOUSE_SELF_COUNT,
+        sum( HOUSE_LEASE_COUNT ) AS HOUSE_LEASE_COUNT,
+        sum( HOUSE_IDLE_COUNT ) AS HOUSE_IDLE_COUNT,
+        sum( USER_COUNT ) AS USER_COUNT,
+        sum( USER_RESI_COUNT ) AS USER_RESI_COUNT,
+        sum( USER_FLOAT_COUNT ) AS USER_FLOAT_COUNT,
+        sum( HOUSE_INCR ) AS HOUSE_INCR,
+        sum( HOUSE_MODIFY ) AS HOUSE_MODIFY,
+        sum( USER_INCR ) AS USER_INCR,
+        sum( USER_MODIFY ) AS USER_MODIFY
+        FROM
+        fact_grid_user_house_daily d
+        LEFT JOIN dim_grid g ON g.id = d.GRID_ID
+        LEFT JOIN dim_agency a ON a.id = d.PID
+        <if test="customerId != null and customerId != ''">
+            AND g.CUSTOMER_ID = #{customerId}
+            AND d.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test="agencyId != null and agencyId != ''">
+            AND d.GRID_ID = #{agencyId}
+        </if>
+        <if test="dateId != null and dateId != ''">
+            AND d.DATE_ID = #{dateId}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
+        </if>
+    </select>
+
     <select id="statAgency" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
         SELECT
             t.*,