Merge branch 'dev_warn_notice' into develop

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

@@ -102,10 +102,19 @@ public interface OperCustomizeOpenFeignClient {
     Result<List<IcResiCategoryStatsConfigDTO>> getCategoryList(@RequestBody IcResiCategoryStatsConfigDTO dto);
 
 
-
+    /**
+     * 获取居民类别配置表ic_resi_category_stats_config，根据token里的客户id查询，可根据状态筛选：显示：show；隐藏：hidden；
+     * @param formDTO
+     * @return
+     */
     @PostMapping("/oper/customize/resicategorystatsconfig/resicategorystatslistshowd")
     Result<List<IcResiCategoryStatsConfigDTO>> resiCategoryStatsListShowd(@RequestBody IcResiCategoryStatsConfigFormDTO formDTO);
 
+    /**
+     * 查询ic_resi_category_warn_config,返回预警的类别
+     * @param customerId
+     * @return
+     */
     @PostMapping("/oper/customize/resicategorystatsconfig/resicategorywarnlist")
     Result<List<IcResiCategoryWarnConfigDTO>> resiCategoryWarnList(@RequestParam String customerId);
 

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

@@ -128,6 +128,12 @@ public class ResiCategoryStatsConfigController {
         return new Result<IcResiCategoryStatsConfigResultDTO>().ok(resiCategoryStatsConfigService.info(formDTO.getId(),tokenDTO.getCustomerId()));
     }
 
+    /**
+     * 获取居民类别配置表ic_resi_category_stats_config，根据token里的客户id查询，可根据状态筛选：显示：show；隐藏：hidden；
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     */
     @PostMapping("resicategorystatslistshowd")
     public Result<List<IcResiCategoryStatsConfigDTO>> resiCategoryStatsListShowd(@LoginUser TokenDto tokenDTO,@RequestBody IcResiCategoryStatsConfigFormDTO formDTO){
         //获取预警配置列表
@@ -145,6 +151,11 @@ public class ResiCategoryStatsConfigController {
         return new Result<List<IcResiCategoryStatsConfigDTO>>().ok(ConvertUtils.sourceToTarget(statsConfigEntityList, IcResiCategoryStatsConfigDTO.class));
     }
 
+    /**
+     * 查询ic_resi_category_warn_config,返回预警的类别
+     * @param customerId
+     * @return
+     */
     @PostMapping("resicategorywarnlist")
     public Result<List<IcResiCategoryWarnConfigDTO>> resiCategoryWarnList(@RequestParam String customerId){
         //获取预警配置列表

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

@@ -22,4 +22,6 @@ public class PersonWarnRightListFormDTO implements Serializable {
 
     @NotNull(message = "pageSize不能为空",groups = PersonWarnRightListForm.class)
     private Integer pageSize;
+
+    private String categoryCode;
 }

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

@@ -20,7 +20,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 
@@ -38,21 +37,52 @@ public class IcStatsResiWarnBuildingResultDTO implements Serializable {
 
     /**
      * 预警配置ID
+     * ic_resi_category_warn_config.id
      */
 	private String configId;
 
+    /**
+     * ic_resi_category_warn_config.label
+     * 类别名
+     */
 	private String label;
 
+    /**
+     * 排序
+     */
 	private Integer sort;
+
+    /**
+     * 等级1阈值
+     */
 	private Integer level1;
     private Integer levelCount1;
+
+    /**
+     * 等级2阈值
+     */
     private Integer level2;
     private Integer levelCount2;
+
+    /**
+     * 等级3阈值
+     */
     private Integer level3;
     private Integer levelCount3;
 
+    /**
+     * 管理平台分类图标
+     */
     private String managementIcon;
+
+    /**
+     * 数据平台分类图标
+     */
     private String dataIcon;
+
+    /**
+     * 房屋显示分类图标
+     */
     private String houseShowIcon;
     private Integer count;
 

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

@@ -35,6 +35,9 @@ public class PersonWarnRightListResultDTO implements Serializable {
          */
         private List<String> type;
 
+        @JsonIgnore
+        private String sortString;
+
         /**
          * 所属网格
          */

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

@@ -17,19 +17,15 @@
 
 package com.epmet.controller;
 
-import com.epmet.common.token.annotation.Login;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.form.StatsResiWarnCountFormDTO;
 import com.epmet.dto.form.StatsResiWarnFormDTO;
-import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
-import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
 import com.epmet.service.IcStatsResiWarnService;
 import com.epmet.service.StatsResiWarnService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,6 +76,12 @@ public class StatsResiWarnController {
         return new Result<List<IcStatsResiResultDTO>>().ok(statsResiWarnService.list2(formDTO));
     }
 
+    /**
+     * 可视化分析-人员预警，各类别楼栋数量展示
+     * @param tokenDto
+     * @param formDTO 只有agencyId
+     * @return
+     */
     @PostMapping("buildingwarnlist")
     public Result buildingWarnList(@LoginUser TokenDto tokenDto,@RequestBody StatsResiWarnFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, StatsResiWarnFormDTO.ListSelectedBuilding.class);
@@ -89,6 +91,13 @@ public class StatsResiWarnController {
         return new Result().ok(icStatsResiWarnBuildingResultDTOS);
 
     }
+
+    /**
+     * 可视化分析-人员预警，楼栋列表展示
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
     @PostMapping("userwarnlist")
     public Result userWarnList(@LoginUser TokenDto tokenDto,@RequestBody StatsResiWarnFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, StatsResiWarnFormDTO.ListSelectedUser.class);

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

@@ -17,12 +17,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
-import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
-import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -35,8 +32,23 @@ import java.util.Map;
  */
 public interface StatsResiWarnService{
 
+    /**
+     * 可视化分析-人员预警，各类别楼栋数量展示
+     * @param customerId
+     * @param agencyID
+     * @return
+     */
     List<IcStatsResiWarnBuildingResultDTO> buildingwWarnList(String customerId,String agencyID);
 
+    /**
+     * 可视化分析-人员预警，楼栋列表展示
+     * @param customerId
+     * @param configId
+     * @param buildingIdList
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
     Map<String,Object> userWarnList(String customerId, String configId, List<String> buildingIdList, Integer pageNo, Integer pageSize);
 
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);

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

@@ -1186,8 +1186,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if (CollectionUtils.isEmpty(configListResult.getData())){
             return result;
         }
-        List<CustomerCategoryShowAndWarnListResultDTO> configList = configListResult.getData();
-        PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectResiUsers(configList.stream().map(m -> m.getColumnName()).collect(Collectors.toList()), staffInfo.getAgencyId()));
+        List<CustomerCategoryShowAndWarnListResultDTO> configListOrigin = configListResult.getData();
+        List<CustomerCategoryShowAndWarnListResultDTO> configList = new ArrayList<>();
+        if (StringUtils.isNotBlank(formDTO.getCategoryCode())){
+            for (CustomerCategoryShowAndWarnListResultDTO c : configListOrigin) {
+                if (c.getColumnName().equals(formDTO.getCategoryCode())){
+                    configList.add(c);
+                }
+            }
+        }else {
+            configList = configListOrigin;
+        }
+        List<CustomerCategoryShowAndWarnListResultDTO> finalConfigList = configList;
+        PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectResiUsers(finalConfigList.stream().map(m -> m.getColumnName()).collect(Collectors.toList()), staffInfo.getAgencyId()));
         List<Map<String, Object>> list = pageInfo.getList();
         if (CollectionUtils.isEmpty(list)) {
             return result;
@@ -1200,7 +1211,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         List<HouseInfoDTO> houseInfos = houseInfosResult.getData();
         userList.forEach(u -> houseInfos.stream().filter(h -> h.getHomeId().equals(u.getHomeId())).forEach(h -> u.setFamily(h.getAllName())));
-        result.setList(userList);
+        // 类型+网格+家庭 排序
+        userList.forEach(u -> {
+            String types = u.getType().stream().map(String::valueOf).collect(Collectors.joining("、"));
+            String s = types + u.getGridName() + u.getFamily();
+            u.setSortString(s);
+        });
+        List<PersonWarnRightListResultDTO.PersonWarnRightList> finalResult = userList.stream().sorted(Comparator.comparing(PersonWarnRightListResultDTO.PersonWarnRightList::getSortString)).collect(Collectors.toList());
+        result.setList(finalResult);
         return result;
     }
 

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

@@ -50,6 +50,12 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
     @Resource
     private IcResiUserDao icResiUserDao;
 
+    /**
+     * 可视化分析-人员预警，各类别楼栋数量展示
+     * @param customerId
+     * @param agencyID
+     * @return
+     */
     @Override
     public List<IcStatsResiWarnBuildingResultDTO> buildingwWarnList(String customerId,String agencyID) {
         List<IcStatsResiWarnBuildingResultDTO> result = new ArrayList<>();