人员分类接口调整

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryAllListResultDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/17 10:52 上午
+ * @DESC
+ */
+@Data
+public class IndividualCategoryAllListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3294223041221531203L;
+
+    /**
+     * 标签
+     */
+    private String label;
+
+    /**
+     * 图片
+     */
+    private String managementIcon;
+
+    /**
+     * 字段名
+     */
+    private String columnName;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    private String id;
+
+    /**
+     * 是否选中 true：是；false：否
+     */
+    private boolean isSelected = false;
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -35,4 +36,6 @@ public class IndividualCategoryListResultDTO implements Serializable {
     private Integer sort;
 
     private String id;
+
+    private Integer count = NumConstant.ZERO;
 }

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

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcIndividualCategoryManageDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
 import com.epmet.dto.form.PackageEditIndividualCategoryFormDTO;
+import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.service.IcIndividualCategoryManageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,4 +57,15 @@ public class IcIndividualCategoryManageController {
         return new Result();
     }
 
+    /**
+     * @Description  查询客户下人员分类，并且赋值本人选中的
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/20 10:44 上午
+     */
+    @PostMapping("individualcategoryalllist")
+    public Result<List<IndividualCategoryAllListResultDTO>> individualCategoryAllList(@LoginUser TokenDto tokenDto){
+        return new Result<List<IndividualCategoryAllListResultDTO>>().ok(icIndividualCategoryManageService.individualCategoryAllList(tokenDto));
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcIndividualCategoryManageDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
+import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
 
@@ -36,4 +37,12 @@ public interface IcIndividualCategoryManageService extends BaseService<IcIndivid
      */
     void editIndividualCategory(List<EditIndividualCategoryFormDTO> formDTOS, TokenDto tokenDto);
 
+    /**
+     * @Description  查询客户下人员分类，并且赋值本人选中的
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/20 10:44 上午
+     */
+    List<IndividualCategoryAllListResultDTO> individualCategoryAllList(TokenDto tokenDto);
+
 }

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

@@ -1,14 +1,27 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.exception.EpmetException;
 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.IcIndividualCategoryManageDao;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
+import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
+import com.epmet.dto.form.StatsResiListFormDTO;
+import com.epmet.dto.result.IcStatsResiResultDTO;
+import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
+import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcIndividualCategoryManageService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,6 +37,11 @@ import java.util.List;
 @Service
 public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcIndividualCategoryManageDao, IcIndividualCategoryManageEntity> implements IcIndividualCategoryManageService {
 
+    @Autowired
+    private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient userOpenFeignClient;
+
     /**
      * @Description 【人员分类管理】查询个人分类列表
      * @param tokenDto
@@ -32,10 +50,30 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
      */
     @Override
     public List<IndividualCategoryListResultDTO> individualCategoryList(TokenDto tokenDto) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException(String.format("查询工作人员%s信息失败...",tokenDto.getUserId()));
+        }
+        StatsResiListFormDTO formDTO = new StatsResiListFormDTO();
+        formDTO.setId(staffInfo.getAgencyId());
+        formDTO.setLevel("agency");
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        Result<List<IcStatsResiResultDTO>> list = userOpenFeignClient.getPersonCategoryList(formDTO);
+        if (!list.success()){
+            throw new EpmetException("查询人员分类下人数失败...");
+        }
+        List<IcStatsResiResultDTO> datas = list.getData();
         List<IndividualCategoryListResultDTO> result = baseDao.individualCategoryList(tokenDto.getUserId());
-        if (CollectionUtils.isNotEmpty(result)){
+        if (CollectionUtils.isNotEmpty(datas) && CollectionUtils.isNotEmpty(result)){
+            result.forEach( r -> datas.stream().filter( d -> d.getId().equals(r.getId())).forEach(d -> r.setCount(d.getCount())));
+            return result;
+        }
+        if (CollectionUtils.isEmpty(datas) && CollectionUtils.isNotEmpty(result)){
             return result;
         }
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
         return new ArrayList<>();
     }
 
@@ -59,4 +97,28 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
             insertBatch(entities);
         }
     }
+
+    /**
+     * @Description  查询客户下人员分类，并且赋值本人选中的
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/20 10:44 上午
+     */
+    @Override
+    public List<IndividualCategoryAllListResultDTO> individualCategoryAllList(TokenDto tokenDto) {
+        IcResiCategoryStatsConfigFormDTO formDTO = new IcResiCategoryStatsConfigFormDTO();
+        Result<List<IcResiCategoryStatsConfigDTO>> listResult = operCustomizeOpenFeignClient.resiCategoryStatsListShowd(formDTO);
+        if (!listResult.success()){
+            throw new EpmetException("查询客户下的人员类别失败...");
+        }
+        if (CollectionUtils.isEmpty(listResult.getData())){
+            return new ArrayList<>();
+        }
+        List<IndividualCategoryAllListResultDTO> result = ConvertUtils.sourceToTarget(listResult.getData(), IndividualCategoryAllListResultDTO.class);
+        List<IndividualCategoryListResultDTO> configs = baseDao.individualCategoryList(tokenDto.getUserId());
+        if (CollectionUtils.isNotEmpty(configs)){
+            result.forEach(r -> configs.stream().filter(c -> c.getColumnName().equals(r.getColumnName())).forEach(c -> r.setSelected(true)));
+        }
+        return result;
+    }
 }

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

@@ -43,4 +43,6 @@ public class StatsResiListFormDTO implements Serializable {
     @NotBlank(message = "level不能为空")
     private String level;
 
+    private String customerId;
+
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.feign;
 
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -24,8 +25,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-// @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
+ @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
 public interface EpmetUserOpenFeignClient {
 
     /**
@@ -708,4 +709,7 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/userbaseinfo/resirelationinfo")
     Result<RegisterRelationDTO> resiRelationInfo(@RequestParam("userId")String userId);
 
+    @PostMapping("/epmetuser/statsresiwarn/list2")
+    Result<List<IcStatsResiResultDTO>> getPersonCategoryList(@RequestBody StatsResiListFormDTO formDTO);
+
 }

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

@@ -522,4 +522,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<RegisterRelationDTO> resiRelationInfo(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "resiRelationInfo", userId);
     }
+
+    @Override
+    public Result<List<IcStatsResiResultDTO>> getPersonCategoryList(StatsResiListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPersonCategoryList", formDTO);
+    }
 }

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

@@ -60,12 +60,23 @@ public class StatsResiWarnController {
     private StatsResiWarnService statsResiWarnService;
 
     @PostMapping("list")
-    public Result list(@LoginUser TokenDto tokenDto,@RequestBody StatsResiListFormDTO formDTO){
+    public Result<List<IcStatsResiResultDTO>> list(@LoginUser TokenDto tokenDto,@RequestBody StatsResiListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
         String customerId = tokenDto.getCustomerId();
         List<IcStatsResiResultDTO> icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel());
-        return new Result().ok(icStatsResiResultDTOList);
+        return new Result<List<IcStatsResiResultDTO>>().ok(icStatsResiResultDTOList);
+    }
 
+    /**
+     * @Description  内部调了list
+     * @param formDTO
+     * @author zxc
+     * @date 2022/1/20 2:11 下午
+     */
+    @PostMapping("list2")
+    public Result<List<IcStatsResiResultDTO>> list2(@RequestBody StatsResiListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<IcStatsResiResultDTO>>().ok(statsResiWarnService.list2(formDTO));
     }
 
     @PostMapping("buildingwarnlist")

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

@@ -17,6 +17,7 @@
 
 package com.epmet.service;
 
+import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
@@ -38,6 +39,8 @@ public interface StatsResiWarnService{
 
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);
 
+    List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);
+
     void resiWarn(String customerId);
 
     void resiWarnByOne(String customerId,String userId);

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

@@ -10,6 +10,7 @@ import com.epmet.dao.IcStatsResiWarnDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
+import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcStatsResiWarnEntity;
@@ -193,6 +194,11 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         return result;
     }
 
+    @Override
+    public List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO) {
+        return this.list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel());
+    }
+
     /**
      * 统计
      */