【基础信息】家庭 查询房屋

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/11/5 15:59
+ */
+@NoArgsConstructor
+@Data
+public class HouseListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2063032844842070847L;
+    private String houseId;
+    private String houseName;
+    private List<CategoryListBean> categoryList;
+
+    @NoArgsConstructor
+    @Data
+    public static class CategoryListBean {
+        private String name;
+        private String iconUrl;
+        private String isSpecial;
+    }
+}

epmet-module/gov-org/gov-org-server/pom.xml

@@ -113,6 +113,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>oper-customize-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -17,8 +17,10 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 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.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -27,6 +29,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.HouseFormDTO;
+import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.service.IcHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -99,4 +102,16 @@ public class IcHouseController {
         return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard));
     }
 
+    /**
+     * @Description 房屋查询
+     * @Param formDTO
+     * @Return {@link Result< List< HouseListResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 16:01
+     */
+    @PostMapping("houselist")
+    public Result<List<HouseListResultDTO>> getHouseList(@LoginUser TokenDto tokenDto, @RequestBody HouseFormDTO formDTO){
+        return new Result<List<HouseListResultDTO>>().ok(icHouseService.getHouseList(tokenDto, formDTO));
+    }
+
 }

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

@@ -20,8 +20,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.HouseFormDTO;
+import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.entity.IcHouseEntity;
 
 import java.util.List;
@@ -112,4 +114,14 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     List<String> selectHouseInfoByIdCard(String idCard);
 
+    /**
+     * @Description 楼栋下房屋列表
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link List< HouseListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 16:01
+     */
+    List<HouseListResultDTO> getHouseList(TokenDto tokenDto, HouseFormDTO formDTO);
+
 }

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

@@ -22,13 +22,22 @@ 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.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcHouseDao;
 import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
+import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.HouseFormDTO;
+import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.entity.IcHouseEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcHouseService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -36,6 +45,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -48,6 +58,10 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntity> implements IcHouseService {
+    @Resource
+    private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
+    @Resource
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 
     @Override
@@ -147,4 +161,67 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return result;
     }
 
+    /**
+     * @param formDTO
+     * @Description 楼栋下房屋列表
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link List<  HouseListResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 16:01
+     */
+    @Override
+    public List<HouseListResultDTO> getHouseList(TokenDto tokenDto,  HouseFormDTO formDTO) {
+        //查询楼栋下房屋列表
+        LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId());
+        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
+        List<IcHouseEntity> list = baseDao.selectList(wrapper);
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        //获取居民分类列表
+        IcResiCategoryStatsConfigDTO categoryDto = new IcResiCategoryStatsConfigDTO();
+        categoryDto.setCustomerId(tokenDto.getCustomerId());
+        Result<List<IcResiCategoryStatsConfigDTO>> categoryResult =  operCustomizeOpenFeignClient.getCategoryList(categoryDto);
+        if (!categoryResult.success()) {
+            throw new RenException(categoryResult.getCode(), categoryResult.getMsg());
+        }
+        List<IcResiCategoryStatsConfigDTO> categoryList = categoryResult.getData();
+        //获取居民分类数量统计
+        IcResiUserDTO userDTO = new IcResiUserDTO();
+        userDTO.setBuildId(formDTO.getBuildingId());
+        Result<Map<String, Map<String, Integer>>> resultMap = epmetUserOpenFeignClient.getHomeUserCategoryCount(userDTO);
+        if (!resultMap.success()) {
+            throw new RenException(resultMap.getCode(), resultMap.getMsg());
+        }
+        Map<String, Map<String, Integer>> map = resultMap.getData();
+
+        return list.stream().map(item -> {
+            Map<String, Integer> countMap = map.get(item.getId());
+            HouseListResultDTO dto = new HouseListResultDTO();
+            dto.setHouseId(item.getId());
+            dto.setHouseName(item.getHouseName());
+            List<HouseListResultDTO.CategoryListBean> categories = new ArrayList<>();
+            if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) {
+                for (IcResiCategoryStatsConfigDTO category : categoryList) {
+                    if (null == countMap.get(category.getColumnName()) || countMap.get(category.getColumnName()) == NumConstant.ZERO) {
+                        continue;
+                    }
+                    HouseListResultDTO.CategoryListBean bean = new HouseListResultDTO.CategoryListBean();
+                    bean.setName(category.getLabel());
+                    bean.setIconUrl(category.getHouseShowIcon());
+                    if ("党员".equals(category.getLabel())) {
+                        bean.setIsSpecial(NumConstant.ONE_STR);
+                    } else {
+                        bean.setIsSpecial(NumConstant.ZERO_STR);
+                    }
+                    categories.add(bean);
+                }
+            }
+            dto.setCategoryList(categories);
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -3,6 +3,7 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFootBarDTO;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.form.CheckFloatFootBarFormDTO;
 import com.epmet.dto.form.CustomerFootBarFormDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
@@ -97,4 +98,7 @@ public interface OperCustomizeOpenFeignClient {
     @PostMapping("/oper/customize/icformitem/getmustcolumn/{customerId}")
     Result<List<ColumnTableNameResultDTO>> getMustColumn(@PathVariable("customerId") String customerId);
 
+    @PostMapping("/oper/customize/icresicategorystatsconfig/categorylist")
+    Result<List<IcResiCategoryStatsConfigDTO>> getCategoryList(@RequestBody IcResiCategoryStatsConfigDTO dto);
+
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFootBarDTO;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.form.CheckFloatFootBarFormDTO;
 import com.epmet.dto.form.CustomerFootBarFormDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
@@ -79,4 +80,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 	public Result<List<ColumnTableNameResultDTO>> getMustColumn(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getMustColumn", customerId);
 	}
+
+	@Override
+	public Result<List<IcResiCategoryStatsConfigDTO>> getCategoryList(IcResiCategoryStatsConfigDTO dto) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getCategoryList", dto);
+	}
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java

@@ -91,4 +91,9 @@ public class IcResiCategoryStatsConfigController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcResiCategoryStatsConfigExcel.class);
     }
 
+    @PostMapping("categorylist")
+    public Result<List<IcResiCategoryStatsConfigDTO>> getCategoryList(@RequestBody IcResiCategoryStatsConfigDTO dto) {
+        return new Result<List<IcResiCategoryStatsConfigDTO>>().ok(icResiCategoryStatsConfigService.getCategoryList(dto));
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java

@@ -92,4 +92,13 @@ public interface IcResiCategoryStatsConfigService extends BaseService<IcResiCate
      * @date 2021-11-04
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取居民类别
+     * @Param dto
+     * @Return {@link List< IcResiCategoryStatsConfigDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 15:43
+     */
+    List<IcResiCategoryStatsConfigDTO> getCategoryList(IcResiCategoryStatsConfigDTO dto);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java

@@ -17,12 +17,13 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcResiCategoryStatsConfigDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.entity.IcResiCategoryStatsConfigEntity;
@@ -34,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -101,4 +103,24 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl<IcResi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param dto
+     * @Description 获取居民类别
+     * @Param dto
+     * @Return {@link List< IcResiCategoryStatsConfigDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 15:43
+     */
+    @Override
+    public List<IcResiCategoryStatsConfigDTO> getCategoryList(IcResiCategoryStatsConfigDTO dto) {
+        if(StringUtils.isBlank(dto.getCustomerId())) {
+           return Collections.emptyList();
+        }
+        LambdaQueryWrapper<IcResiCategoryStatsConfigEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcResiCategoryStatsConfigEntity::getCustomerId, dto.getCustomerId());
+        wrapper.orderByAsc(IcResiCategoryStatsConfigEntity::getSort);
+        List<IcResiCategoryStatsConfigEntity> list = baseDao.selectList(wrapper);
+        return ConvertUtils.sourceToTarget(list, IcResiCategoryStatsConfigDTO.class);
+    }
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -650,4 +650,7 @@ public interface EpmetUserOpenFeignClient {
 
     @PostMapping("/epmetuser/icresidemanddict/demandoption/demandoption")
     Result<List<OptionResultDTO>> getDemandOptions();
+
+    @PostMapping("/epmetuser/icresiuser/categorycount")
+    Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -469,4 +469,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<OptionResultDTO>> getDemandOptions() {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getDemandOptions", null);
     }
+
+    @Override
+    public Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(IcResiUserDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHomeUserCategoryCount", formDTO);
+    }
 }

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

@@ -162,7 +162,7 @@ public class IcResiUserController {
                         continue;
                     }
 
-                    if (item2.getItemType().equals("checkbox") || item2.getItemType().equals("select") || item2.getItemType().equals("radio")) {
+                    if ("checkbox".equals(item2.getItemType()) || "select".equals(item2.getItemType()) || "radio".equals(item2.getItemType())) {
                         itemMap.put(item2.getColumnName().concat(item2.getColumnNum() == 0 ? "" : item2.getColumnNum().toString()), ConvertUtils.sourceToTarget(item2, FormItem.class));
                     }
                 }
@@ -181,7 +181,7 @@ public class IcResiUserController {
                 if (StringUtils.isBlank(formItem2.getColumnName())) {
                     continue;
                 }
-                if (formItem2.getItemType().equals("checkbox") || formItem2.getItemType().equals("select") || formItem2.getItemType().equals("radio")) {
+                if ("checkbox".equals(formItem2.getItemType()) || "select".equals(formItem2.getItemType()) || "radio".equals(formItem2.getItemType())) {
                     itemMap.put(formItem2.getColumnName().concat(formItem2.getColumnNum() == 0 ? "" : formItem2.getColumnNum().toString()), ConvertUtils.sourceToTarget(formItem2, FormItem.class));
                 }
             }
@@ -292,4 +292,16 @@ public class IcResiUserController {
         return new Result<OwnerRelationResultDTO>().ok(icResiUserService.getOwnerRelation(formDTO.getUserId()));
     }
 
+    /**
+     * @Description 获取一栋楼每个房间人员分类的数量
+     * @Param formDTO
+     * @Return {@link Result< Map< String, Map< String, Integer>>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 15:10
+     */
+    @PostMapping("categorycount")
+    public Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO) {
+        return new Result<Map<String, Map<String, Integer>>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId()));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -23,6 +23,7 @@ import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.PersonDataResultDTO;
 import com.epmet.dto.result.SearchByNameResultDTO;
 import com.epmet.entity.IcResiUserEntity;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -119,6 +120,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<SearchByNameResultDTO> searchByName(@Param("name")String name, @Param("agencyId")String agencyId,@Param("pageNo")Integer pageNo);
 
     Set<String> selectUserDemandCode(String icResiUserId);
-
     String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
+
+    @MapKey("HOME_ID")
+    Map<String, Map<String, Integer>> getHomeUserCategoryCount(@Param("buildId") String buildId);
 }

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

@@ -120,4 +120,13 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2021/11/5 10:28
      */
     OwnerRelationResultDTO getOwnerRelation(String userId);
+
+    /**
+     * @Description 获取一栋楼每个房间人员分类的数量
+     * @Param buildId
+     * @Return {@link Map< String, Map< String, Integer>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 14:40
+     */
+    Map<String, Map<String, Integer>> getHomeUserCategoryCount(String buildId);
 }

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

@@ -658,4 +658,17 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         result.setUserList(userList);
         return result;
     }
+
+    /**
+     * @param buildId
+     * @Description 获取一栋楼每个房间人员分类的数量
+     * @Param buildId
+     * @Return {@link Map<String,Map<String,Integer>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/5 14:40
+     */
+    @Override
+    public Map<String, Map<String, Integer>> getHomeUserCategoryCount(String buildId) {
+        return baseDao.getHomeUserCategoryCount(buildId);
+    }
 }

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

@@ -214,4 +214,30 @@
             </foreach>
         </if>
     </select>
+    <select id="getHomeUserCategoryCount" resultType="java.util.Map">
+        SELECT
+            HOME_ID,
+            SUM(IF('1' = IS_PARTY, 1, 0)) AS IS_PARTY,
+            SUM(IF('1' = IS_DBH, 1, 0)) AS IS_DBH,
+            SUM(IF('1' = IS_ENSURE_HOUSE, 1, 0)) AS IS_ENSURE_HOUSE,
+            SUM(IF('1' = IS_UNEMPLOYED, 1, 0)) AS IS_UNEMPLOYED,
+            SUM(IF('1' = IS_YLFN, 1, 0)) AS IS_YLFN,
+            SUM(IF('1' = IS_VETERANS, 1, 0)) AS IS_VETERANS,
+            SUM(IF('1' = IS_UNITED_FRONT, 1, 0)) AS IS_UNITED_FRONT,
+            SUM(IF('1' = IS_XFRY, 1, 0)) AS IS_XFRY,
+            SUM(IF('1' = IS_VOLUNTEER, 1, 0)) AS IS_VOLUNTEER,
+            SUM(IF('1' = IS_OLD_PEOPLE, 1, 0)) AS IS_OLD_PEOPLE,
+            SUM(IF('1' = IS_KC, 1, 0)) AS IS_KC,
+            SUM(IF('1' = IS_SD, 1, 0)) AS IS_SD,
+            SUM(IF('1' = IS_SN, 1, 0)) AS IS_SN,
+            SUM(IF('1' = IS_SZ, 1, 0)) AS IS_SZ,
+            SUM(IF('1' = IS_CJ, 1, 0)) AS IS_CJ,
+            SUM(IF('1' = IS_DB, 1, 0)) AS IS_DB,
+            SUM(IF('1' = IS_MB, 1, 0)) AS IS_MB,
+            SUM(IF('1' = IS_SPECIAL, 1, 0)) AS IS_SPECIAL
+        FROM ic_resi_user
+        WHERE DEL_FLAG = 0
+        AND BUILD_ID = #{buildId}
+        GROUP BY HOME_ID
+    </select>
 </mapper>