完善网格和组织查询方式

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/result/FactUserHouseResultDTO.java

@@ -0,0 +1,154 @@
+package com.epmet.dto.stats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 人房信息统计数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+@Data
+public class FactUserHouseResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键，customer_id+AGENCY_ID+date_id只有一条记录
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd; 
+     */
+	private String dateId;
+
+    /**
+     * 组织id
+     */
+	private String agencyId;
+
+    /**
+     * 组织id
+     */
+    private String agencyName;
+
+    /**
+     * agency_id所属的机关级别（社区级：community，
+乡（镇、街道）级:street,
+区县级: district,
+市级: city
+省级:province）
+     */
+	private String level;
+
+    /**
+     * 组织i所属的组织id
+     */
+	private String pid;
+
+    /**
+     * 组织i所有上级id
+     */
+	private String pids;
+
+    /**
+     * 小区总数
+     */
+	private Integer neighbourhoodsCount;
+
+    /**
+     * 房屋总数
+     */
+	private Integer houseCount;
+
+    /**
+     * 自住房屋总数
+     */
+	private Integer houseSelfCount;
+
+    /**
+     * 出租房屋总数
+     */
+	private Integer houseLeaseCount;
+
+    /**
+     * 闲置房屋总数
+     */
+	private Integer houseIdleCount;
+
+    /**
+     * 居民总数
+     */
+	private Integer userCount;
+
+    /**
+     * 常住居民总数
+     */
+	private Integer userResiCount;
+
+    /**
+     * 流动居民总数
+     */
+	private Integer userFloatCount;
+
+    /**
+     * 当日新增房屋数
+     */
+	private Integer houseIncr;
+
+    /**
+     * 当日修改房屋数
+     */
+	private Integer houseModify;
+
+    /**
+     * 当日新增居民数
+     */
+	private Integer userIncr;
+
+    /**
+     * 当日修改居民数
+     */
+	private Integer userModify;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -4,8 +4,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.stats.FactAgencyUserHouseDailyDTO;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
 import com.epmet.excel.FactUserHouseExcel;
 import com.epmet.service.stats.FactAgencyUserHouseDailyService;
+import com.epmet.service.stats.FactUserHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,17 +30,17 @@ import java.util.Map;
 public class FactUserHouseController {
 
     @Autowired
-    private FactAgencyUserHouseDailyService factAgencyUserHouseDailyService;
+    private FactUserHouseService factUserHouseService;
 
     @RequestMapping("page")
-    public Result<PageData<FactAgencyUserHouseDailyDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<FactUserHouseResultDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<FactAgencyUserHouseDailyDTO> page = factAgencyUserHouseDailyService.page(params);
+        PageData<FactUserHouseResultDTO> page = factUserHouseService.page(params);
-        return new Result<PageData<FactAgencyUserHouseDailyDTO>>().ok(page);
+        return new Result<PageData<FactUserHouseResultDTO>>().ok(page);
     }
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<FactAgencyUserHouseDailyDTO> list = factAgencyUserHouseDailyService.list(params);
+        List<FactUserHouseResultDTO> list = factUserHouseService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, FactUserHouseExcel.class);
     }
 

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

@@ -1,9 +1,13 @@
 package com.epmet.dao.stats;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
 import com.epmet.entity.stats.FactAgencyUserHouseDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 人房信息统计数，按天统计
  *
@@ -13,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface FactAgencyUserHouseDailyDao extends BaseDao<FactAgencyUserHouseDailyEntity> {
 
+    List<FactUserHouseResultDTO> listPage(Map<String, Object> params);
+
 }

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

@@ -1,9 +1,13 @@
 package com.epmet.dao.stats;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
 import com.epmet.entity.stats.FactGridUserHouseDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 网格的人房信息统计数，按天统计
  *
@@ -13,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface FactGridUserHouseDailyDao extends BaseDao<FactGridUserHouseDailyEntity> {
 
+    List<FactUserHouseResultDTO> listPage(Map<String, Object> params);
+
 }

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.result.FactUserHouseResultDTO;
 import com.epmet.entity.stats.FactAgencyUserHouseDailyEntity;
 
 import java.util.List;
@@ -24,7 +25,7 @@ public interface FactAgencyUserHouseDailyService extends BaseService<FactAgencyU
      * @author generator
      * @date 2022-05-27
      */
-    PageData<FactAgencyUserHouseDailyDTO> page(Map<String, Object> params);
+    PageData<FactUserHouseResultDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGridUserHouseDailyService.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.FactGridUserHouseDailyDTO;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
 import com.epmet.entity.stats.FactGridUserHouseDailyEntity;
 
 import java.util.List;
@@ -24,7 +25,7 @@ public interface FactGridUserHouseDailyService extends BaseService<FactGridUserH
      * @author generator
      * @date 2022-05-27
      */
-    PageData<FactGridUserHouseDailyDTO> page(Map<String, Object> params);
+    PageData<FactUserHouseResultDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询

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

@@ -0,0 +1,37 @@
+package com.epmet.service.stats;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.stats.FactAgencyUserHouseDailyDTO;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 人房信息统计数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+public interface FactUserHouseService {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactAgencyUserHouseDailyDTO>
+     * @author generator
+     * @date 2022-05-27
+     */
+    PageData<FactUserHouseResultDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactAgencyUserHouseDailyDTO>
+     * @author generator
+     * @date 2022-05-27
+     */
+    List<FactUserHouseResultDTO> list(Map<String, Object> params);
+}

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

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.FactAgencyUserHouseDailyDao;
+import com.epmet.dto.ChangeDeathDTO;
 import com.epmet.dto.stats.FactAgencyUserHouseDailyDTO;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
 import com.epmet.entity.stats.FactAgencyUserHouseDailyEntity;
 import com.epmet.service.stats.FactAgencyUserHouseDailyService;
 import org.apache.commons.lang3.StringUtils;
@@ -28,13 +31,15 @@ import java.util.Map;
 @Service
 public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAgencyUserHouseDailyDao, FactAgencyUserHouseDailyEntity> implements FactAgencyUserHouseDailyService {
 
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
     @Override
-    public PageData<FactAgencyUserHouseDailyDTO> page(Map<String, Object> params) {
+    public PageData<FactUserHouseResultDTO> page(Map<String, Object> params) {
-        IPage<FactAgencyUserHouseDailyEntity> page = baseDao.selectPage(
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        IPage<FactUserHouseResultDTO> page = getPage(params);
-                getWrapper(params)
+        List<FactUserHouseResultDTO> list = baseDao.listPage(params);
-        );
+        return new PageData<>(list, page.getTotal());
-        return getPageData(page, FactAgencyUserHouseDailyDTO.class);
     }
 
     @Override

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

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.FactGridUserHouseDailyDao;
 import com.epmet.dto.stats.FactGridUserHouseDailyDTO;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
 import com.epmet.entity.stats.FactGridUserHouseDailyEntity;
 import com.epmet.service.stats.FactGridUserHouseDailyService;
 import org.apache.commons.lang3.StringUtils;
@@ -28,13 +30,15 @@ import java.util.Map;
 @Service
 public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridUserHouseDailyDao, FactGridUserHouseDailyEntity> implements FactGridUserHouseDailyService {
 
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
     @Override
-    public PageData<FactGridUserHouseDailyDTO> page(Map<String, Object> params) {
+    public PageData<FactUserHouseResultDTO> page(Map<String, Object> params) {
-        IPage<FactGridUserHouseDailyEntity> page = baseDao.selectPage(
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        IPage<FactUserHouseResultDTO> page = getPage(params);
-                getWrapper(params)
+        List<FactUserHouseResultDTO> list = baseDao.listPage(params);
-        );
+        return new PageData<>(list, page.getTotal());
-        return getPageData(page, FactGridUserHouseDailyDTO.class);
     }
 
     @Override

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

@@ -0,0 +1,58 @@
+package com.epmet.service.stats.impl;
+
+import com.epmet.commons.tools.enums.OrgLevelEnum;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dto.stats.result.FactUserHouseResultDTO;
+import com.epmet.service.stats.FactAgencyUserHouseDailyService;
+import com.epmet.service.stats.FactGridUserHouseDailyService;
+import com.epmet.service.stats.FactUserHouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 人房信息统计数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+@Service
+public class FactUserHouseServiceImpl implements FactUserHouseService {
+
+    @Autowired
+    private FactAgencyUserHouseDailyService factAgencyUserHouseDailyService;
+
+    @Autowired
+    private FactGridUserHouseDailyService factGridUserHouseDailyService;
+
+    @Override
+    public PageData<FactUserHouseResultDTO> page(Map<String, Object> params) {
+        PageData<FactUserHouseResultDTO> page = null;
+        if (params.containsKey("level")) {
+            if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString()) || OrgLevelEnum.COMMUNITY.getCode().equals(params.get("level").toString())) {
+                page = factGridUserHouseDailyService.page(params);
+            } else {
+                page = factAgencyUserHouseDailyService.page(params);
+            }
+        }
+        return page;
+    }
+
+    @Override
+    public List<FactUserHouseResultDTO> list(Map<String, Object> params) {
+        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);
+            } else {
+                list = ConvertUtils.sourceToTarget(factAgencyUserHouseDailyService.list(params), FactUserHouseResultDTO.class);
+            }
+        }
+        return list;
+    }
+
+}

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

@@ -31,5 +31,27 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <select id="listPage" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
+        SELECT
+        a.*,
+        d.AGENCY_NAME
+        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="startTime != null and startTime != ''">
+            AND a.DATE_ID >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND a.DATE_ID &lt;= #{endTime}
+        </if>
+        ORDER BY
+        a.CREATED_TIME DESC
+    </select>
 </mapper>

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

@@ -30,5 +30,28 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <select id="listPage" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
+        SELECT
+        g.*,
+        g.GRID_ID AS agencyId,
+        d.GRID_NAME AS agencyName
+        FROM
+        fact_grid_user_house_daily g
+        LEFT JOIN dim_grid d ON d.id = g.GRID_ID
+        <if test="customerId != null and customerId != ''">
+            AND g.CUSTOMER_ID = #{customerId}
+            AND g.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test="agencyId != null and agencyId != ''">
+            AND g.GRID_ID = #{agencyId}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND g.DATE_ID >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND g.DATE_ID &lt;= #{endTime}
+        </if>
+        ORDER BY
+        g.CREATED_TIME DESC
+    </select>
 </mapper>