Merge remote-tracking branch 'origin/dev_resi_export' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChartFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @dscription 【人房】房屋总数饼图-接口入参
+ */
+@Data
+public class HouseChartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 405799151478155056L;
+
+    /**
+     * 组织、网格、小区Id
+     */
+    private String orgId;
+    /**
+     * 组织、网格、小区类型 agency  grid   village
+     */
+    private String orgType;
+
+    //token这信息
+    private String customerId;
+    private String userId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java

@@ -0,0 +1,50 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @dscription 【人房】房屋总数饼图-接口返参
+ */
+@Data
+public class HouseChartResultDTO implements Serializable {
+    /**
+     * 组织、网格、小区Id
+     */
+    private String orgId;
+    /**
+     * 组织、网格、小区类型 agency  grid   village
+     */
+    private String orgType;
+    /**
+     * 房屋总数
+     */
+    private Integer houseTotal;
+    /**
+     * 房屋自住总数
+     */
+    private Integer zzHouseTotal;
+    /**
+     * 房屋自住总数占比（保留两位小数，带百分号的）
+     */
+    private String zzHouseRatio;
+    /**
+     * 房屋常住总数
+     */
+    private Integer czHouseTotal;
+    /**
+     * 房屋常住总数占比（保留两位小数，带百分号的）
+     */
+    private String czHouseRatio;
+    /**
+     * 房屋闲置总数
+     */
+    private Integer xzHouseTotal;
+    /**
+     * 房屋闲置总数占比（保留两位小数，带百分号的）
+     */
+    private String xzHouseRatio;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java

@@ -0,0 +1,74 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @dscription 【人房】下级人房概览列表-接口返参
+ */
+@Data
+public class SubUserHouseListResultDTO implements Serializable {
+    /**
+     * 组织、网格、小区Id
+     */
+    private String orgId;
+    /**
+     * 组织、网格、小区名称
+     */
+    private String orgName;
+    /**
+     * 组织、网格、小区类型 agency  grid   village
+     */
+    private String orgType;
+    /**
+     * 房屋总数
+     */
+    private Integer houseTotal;
+    /**
+     * 房屋自住总数
+     */
+    private Integer zzHouseTotal;
+    /**
+     * 房屋自住总数占比（保留两位小数，带百分号的）
+     */
+    private String zzHouseRatio;
+    /**
+     * 房屋常住总数
+     */
+    private Integer czHouseTotal;
+    /**
+     * 房屋常住总数占比（保留两位小数，带百分号的）
+     */
+    private String czHouseRatio;
+    /**
+     * 房屋闲置总数
+     */
+    private Integer xzHouseTotal;
+    /**
+     * 房屋闲置总数占比（保留两位小数，带百分号的）
+     */
+    private String xzHouseRatio;
+    /**
+     * 居民总数
+     */
+    private Integer userTotal;
+    /**
+     * 常住人口总数
+     */
+    private Integer czUserTotal;
+    /**
+     * 常住人口占比（保留两位小数，带百分号的）
+     */
+    private String czUserRatio;
+    /**
+     * 流动人口总数
+     */
+    private Integer ldUserTotal;
+    /**
+     * 流动人口占比（保留两位小数，带百分号的）
+     */
+    private String ldUserRatio;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -31,10 +31,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.IcHouseListResultDTO;
-import com.epmet.dto.result.ImportTaskCommonResultDTO;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.HouseService;
@@ -47,7 +44,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
 
 
 /**
@@ -248,4 +248,29 @@ public class HouseController implements ResultDataResolver {
         }
         return new Result<HouseInfoDTO>().ok(houseService.getHouseInfoDTO(tokenDto.getCustomerId(), houseId));
     }
+
+    /**
+     * @Author sun
+     * @Description 【人房】房屋总数饼图
+     **/
+    @NoRepeatSubmit
+    @PostMapping("housechart")
+    public Result<HouseChartResultDTO> houseChart(@LoginUser TokenDto tokenDto, @RequestBody HouseChartFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<HouseChartResultDTO>().ok(houseService.houseChart(formDTO));
+    }
+
+    /**
+     * @Author sun
+     * @Description 【人房】下级人房概览列表
+     **/
+    @NoRepeatSubmit
+    @PostMapping("subuserhouselist")
+    public Result<List<SubUserHouseListResultDTO>> subUserHouseList(@LoginUser TokenDto tokenDto, @RequestBody HouseChartFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<List<SubUserHouseListResultDTO>>().ok(houseService.subUserHouseList(formDTO));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -19,13 +19,8 @@ package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.IcHouseAddFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.IcHouseListFormDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.form.ImportInfoFormDTO;
-import com.epmet.dto.form.NeighborHoodManageDelFormDTO;
-import com.epmet.dto.result.HouseInfoDTO;
-import com.epmet.dto.result.IcHouseListResultDTO;
-import com.epmet.dto.result.ImportTaskCommonResultDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -69,4 +64,16 @@ public interface HouseService {
 
 
     HouseInfoDTO getHouseInfoDTO(String customerId,String houseId);
+
+    /**
+     * @Author sun
+     * @Description 【人房】房屋总数饼图
+     **/
+    HouseChartResultDTO houseChart(HouseChartFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 【人房】下级人房概览列表
+     **/
+    List<SubUserHouseListResultDTO> subUserHouseList(HouseChartFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -29,10 +29,7 @@ import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.IcHouseListResultDTO;
-import com.epmet.dto.result.ImportTaskCommonResultDTO;
-import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseTypeEnums;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -346,4 +343,23 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
         return houseInfo;
     }
+
+    /**
+     * @Author sun
+     * @Description 【人房】房屋总数饼图
+     **/
+    @Override
+    public HouseChartResultDTO houseChart(HouseChartFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Author sun
+     * @Description 【人房】下级人房概览列表
+     **/
+    @Override
+    public List<SubUserHouseListResultDTO> subUserHouseList(HouseChartFormDTO formDTO) {
+        return null;
+    }
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnFormDTO.java

@@ -22,7 +22,6 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 
@@ -40,7 +39,7 @@ public class StatsResiWarnFormDTO implements Serializable {
     public interface ListSelectedBuilding {}
 
     public interface ListSelectedUser {}
-
+    public interface AllUser {}
 
     /**
      * 当前页
@@ -57,10 +56,11 @@ public class StatsResiWarnFormDTO implements Serializable {
     @NotBlank(message = "组织id不能为空",groups = {ListSelectedBuilding.class})
 	private String agencyId;
 
-    @NotBlank(message = "配置id不能为空",groups = {ListSelectedUser.class})
+    @NotBlank(message = "配置id不能为空",groups = {ListSelectedUser.class, AllUser.class})
     private String configId;
     @NotNull(message = "楼栋不能为空",groups = {ListSelectedUser.class})
     private List<String> buildingIdList;
-
+    @NotBlank(message = "楼栋不能为空",groups = {AllUser.class})
-
+    private String buildingId;
+    private String customerId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @dscription 【人房】居民总数饼图-接口入参
+ */
+@Data
+public class UserChartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 405799151478155056L;
+
+    /**
+     * 组织、网格、小区Id
+     */
+    private String orgId;
+    /**
+     * 组织、网格、小区类型 agency  grid   village
+     */
+    private String orgType;
+
+    //token这信息
+    private String customerId;
+    private String userId;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnUserResultDTO.java

@@ -43,6 +43,7 @@ public class IcStatsResiWarnUserResultDTO implements Serializable {
     private String neighborhoodName;
     private String buildingName;
     private String residentNames;
+    private Integer count;
     private List<UserWarnNameListResultDTO> userList;
 
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java

@@ -96,4 +96,9 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 * 地区编码全路径：例如：37,3702,370203,370203005,370203005015
 	 */
 	private List<String> areaCodePath;
+
+	/**
+	 * 工作人员所属组织的行政地区编码
+	 */
+	private String areaCode;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @dscription 【人房】居民总数饼图-接口返参
+ */
+@Data
+public class UserChartResultDTO implements Serializable {
+    /**
+     * 组织、网格、小区Id
+     */
+    private String orgId;
+    /**
+     * 组织、网格、小区类型 agency  grid   village
+     */
+    private String orgType;
+    /**
+     * 居民总数
+     */
+    private Integer userTotal;
+    /**
+     * 常住人口总数
+     */
+    private Integer czUserTotal;
+    /**
+     * 常住人口占比（保留两位小数，带百分号的）
+     */
+    private String czUserRatio;
+    /**
+     * 流动人口总数
+     */
+    private Integer ldUserTotal;
+    /**
+     * 流动人口占比（保留两位小数，带百分号的）
+     */
+    private String ldUserRatio;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserWarnNameListResultDTO.java

@@ -21,4 +21,13 @@ public class UserWarnNameListResultDTO implements Serializable {
     private String residentName;
 
     private String userId;
+
+    @JsonIgnore
+    private String unitId;
+    private String unitName;
+    @JsonIgnore
+    private String homeId;
+    private String doorName;
+    private String mobile;
+    private String idCard;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -888,4 +888,17 @@ public class IcResiUserController implements ResultDataResolver {
         });
         return new Result();
     }
+
+    /**
+     * @Author sun
+     * @Description 【人房】居民总数饼图
+     **/
+    @NoRepeatSubmit
+    @PostMapping("userchart")
+    public Result<HouseChartResultDTO> userChart(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<HouseChartResultDTO>().ok(icResiUserService.userChart(formDTO));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -29,6 +30,7 @@ import com.epmet.dto.form.StatsResiWarnFormDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcUserWarnNoticeResultDTO;
+import com.epmet.dto.result.UserWarnNameListResultDTO;
 import com.epmet.service.IcStatsResiWarnService;
 import com.epmet.service.StatsResiWarnService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -115,6 +117,13 @@ public class StatsResiWarnController {
         return new Result().ok(statsResiWarnService.userWarnList(customerId,formDTO.getConfigId(), formDTO.getBuildingIdList(),formDTO.getPageNo(),formDTO.getPageSize()));
     }
 
+    @PostMapping("alluserwarnlist")
+    public Result<PageData<UserWarnNameListResultDTO>> allUserWarnList(@LoginUser TokenDto tokenDto, @RequestBody StatsResiWarnFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, StatsResiWarnFormDTO.AllUser.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<PageData<UserWarnNameListResultDTO>>().ok(statsResiWarnService.allUserWarnList(formDTO));
+    }
+
     /**
      * 统计所有
      * @return

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -244,4 +244,10 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2022/3/29 16:25
      */
     EpidemicPreventionInfoDTO getEpidemicPreventionInfo(EpidemicPreventionFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 【人房】居民总数饼图
+     **/
+    HouseChartResultDTO userChart(UserChartFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java

@@ -17,11 +17,14 @@
 
 package com.epmet.service;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.IcUserWarnNoticeFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
+import com.epmet.dto.form.StatsResiWarnFormDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcUserWarnNoticeResultDTO;
+import com.epmet.dto.result.UserWarnNameListResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -53,6 +56,8 @@ public interface StatsResiWarnService{
      */
     Map<String,Object> userWarnList(String customerId, String configId, List<String> buildingIdList, Integer pageNo, Integer pageSize);
 
+    PageData<UserWarnNameListResultDTO> allUserWarnList(StatsResiWarnFormDTO formDTO);
+
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);
 
     List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -25,6 +25,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -732,19 +733,20 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	}
 
 	@Override
-    public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId,String customerId) {
+	public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId, String customerId) {
 		StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
-		if(null!=resultDTO){
+		if (null != resultDTO) {
-			resultDTO.setRoleList(baseDao.selectStaffRoles(userId,resultDTO.getCustomerId()));
+			resultDTO.setRoleList(baseDao.selectStaffRoles(userId, resultDTO.getCustomerId()));
 			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
-			if (null != staffInfo){
+			if (null != staffInfo) {
 				resultDTO.setAgencyId(staffInfo.getAgencyId());
 				resultDTO.setAgencyName(staffInfo.getAgencyName());
 				resultDTO.setLevel(staffInfo.getLevel());
 				resultDTO.setLongitude(staffInfo.getLongitude());
 				resultDTO.setLatitude(staffInfo.getLatitude());
-				AgencyInfoCache agency= CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+				AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
 				resultDTO.setAreaCodePath(null != agency && !CollectionUtils.isEmpty(agency.getAreaCodePath()) ? agency.getAreaCodePath() : new ArrayList<>());
+				resultDTO.setAreaCode(null != agency && StringUtils.isNotBlank(agency.getAreaCode()) ? agency.getAreaCode() : StrConstant.EPMETY_STR);
 			}
 			//获取工作人员所属客户名
 			CustomerDTO dto = new CustomerDTO();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1594,4 +1594,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new PageData<>(list, null == list?NumConstant.ZERO:list.size());
 
     }
+
+    /**
+     * @Author sun
+     * @Description 【人房】居民总数饼图
+     **/
+    @Override
+    public HouseChartResultDTO userChart(UserChartFormDTO formDTO) {
+        return null;
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -16,6 +18,7 @@ import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
 import com.epmet.dto.form.IcUserWarnNoticeFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
+import com.epmet.dto.form.StatsResiWarnFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcStatsResiWarnEntity;
@@ -24,12 +27,13 @@ import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcStatsResiWarnService;
 import com.epmet.service.StatsResiWarnService;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -173,7 +177,6 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         //根据buildingID，tableName he columnName获取名字
         //限制条数 一栋楼内最多显示1000 即可
         for (String s : buildingIdList) {
-            PageHelper.startPage(NumConstant.ONE,NumConstant.ONE_HUNDRED,false).doSelectPage(()->{
             List<UserWarnNameListResultDTO> dtos = icStatsResiWarnDao.userWarnListDTO(customerId, Arrays.asList(s), icResiCategoryWarnConfigDTO.getTableName(), icResiCategoryWarnConfigDTO.getColumnName());
             if (!CollectionUtils.isEmpty(dtos)){
                 Map<String, List<UserWarnNameListResultDTO>> groupByBuild = dtos.stream().collect(Collectors.groupingBy(UserWarnNameListResultDTO::getBuildingId));
@@ -181,12 +184,11 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
                     item.setConfigId(configId);
                     groupByBuild.forEach((k,v) -> {
                         if (item.getBuildingId().equals(k)){
-                                item.setUserList(v);
+                            item.setCount(v.size());
                         }
                     });
                 });
             }
-            });
         }
         /*PageHelper.startPage(NumConstant.ONE,NumConstant.ONE_THOUSAND,false).doSelectPage(()->{
             List<UserWarnNameListResultDTO> dtos = icStatsResiWarnDao.userWarnListDTO(customerId, buildingIdList, icResiCategoryWarnConfigDTO.getTableName(), icResiCategoryWarnConfigDTO.getColumnName());
@@ -205,6 +207,41 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         return mapResult;
     }
 
+    @Override
+    public PageData<UserWarnNameListResultDTO> allUserWarnList(StatsResiWarnFormDTO formDTO) {
+        //获取configId预警配置信息
+        IcResiCategoryWarnConfigDTO formDto = new IcResiCategoryWarnConfigDTO();
+        formDto.setId(formDTO.getConfigId());
+        Result<IcResiCategoryWarnConfigDTO> warnResult = operCustomizeOpenFeignClient.resiCategoryWarnInfoById(formDto);
+        if (!warnResult.success() || null == warnResult.getData()) {
+            throw new RenException("获取预警配置信息失败,configId="+ formDTO.getConfigId());
+        }
+        IcResiCategoryWarnConfigDTO icResiCategoryWarnConfigDTO = warnResult.getData();
+
+        PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
+        List<UserWarnNameListResultDTO> list = icStatsResiWarnDao.userWarnListDTO(formDTO.getCustomerId(),
+                Collections.singletonList(formDTO.getBuildingId()),
+                    icResiCategoryWarnConfigDTO.getTableName(),
+                        icResiCategoryWarnConfigDTO.getColumnName());
+        PageInfo<UserWarnNameListResultDTO> pageInfo = new PageInfo<>(list);
+        if (CollectionUtils.isNotEmpty(list)) {
+            Set<String> homeIds = list.stream().map(UserWarnNameListResultDTO::getHomeId).collect(Collectors.toSet());
+            Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(homeIds, formDTO.getCustomerId());
+            if (!houseInfoRes.success() || CollectionUtils.isEmpty(houseInfoRes.getData())){
+                throw new EpmetException("查询居民所属房屋失败...");
+            }
+            Map<String, HouseInfoDTO> houseMap = houseInfoRes.getData().stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
+            list.forEach(item -> {
+                HouseInfoDTO houseInfo = houseMap.get(item.getHomeId());
+                if (null != houseInfo) {
+                    item.setUnitName(houseInfo.getUnitName());
+                    item.setDoorName(houseInfo.getDoorName());
+                }
+            });
+        }
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
     @Override
     public List<IcStatsResiResultDTO> list(String customerId,String id, String level) {
         //获取所有配置类项 getshow

epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml

@@ -153,6 +153,10 @@
     <select id="userWarnListDTO" resultType="com.epmet.dto.result.UserWarnNameListResultDTO">
         select
             BUILD_ID as buildingId,
+            UNIT_ID,
+            HOME_ID,
+            MOBILE,
+            ID_CARD,
             name as residentName,
             ID AS userId
         from ic_resi_user