From 6679c3c6fe5fa08d4c1b777ed381b3acf2b9bd4f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 21 Jan 2022 13:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndividualCategoryListResultDTO.java | 4 +++ ...IcIndividualCategoryManageServiceImpl.java | 36 ++++++++----------- .../mapper/IcIndividualCategoryManageDao.xml | 4 ++- .../dto/form/CategoryCountListFormDTO.java | 21 +++++++++++ .../result/CategoryCountListResultDTO.java | 20 +++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../EpmetUserOpenFeignClientFallback.java | 2 +- .../controller/StatsResiWarnController.java | 7 ++-- .../epmet/service/StatsResiWarnService.java | 4 ++- .../impl/StatsResiWarnServiceImpl.java | 13 +++++-- .../resources/mapper/IcStatsResiWarnDao.xml | 2 +- 11 files changed, 84 insertions(+), 31 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CategoryCountListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CategoryCountListResultDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java index 7a7f7d51cc..968987940e 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.result; import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -37,5 +38,8 @@ public class IndividualCategoryListResultDTO implements Serializable { private String id; + @JsonIgnore + private String warnConfigId; + private Integer count = NumConstant.ZERO; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java index 68529e158c..57091b8795 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java @@ -9,13 +9,11 @@ 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.CategoryCountListFormDTO; 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.dto.result.*; import com.epmet.entity.IcIndividualCategoryManageEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -27,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 个人分类管理 @@ -54,27 +53,22 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl> list = userOpenFeignClient.getPersonCategoryList(formDTO); - if (!list.success()){ - throw new EpmetException("查询人员分类下人数失败..."); - } - List datas = list.getData(); List result = baseDao.individualCategoryList(tokenDto.getUserId()); - 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<>(); + CategoryCountListFormDTO formDTO = new CategoryCountListFormDTO(); + formDTO.setConfigList(result.stream().map(m -> m.getWarnConfigId()).collect(Collectors.toList())); + formDTO.setOrgId(staffInfo.getAgencyId()); + Result> list = userOpenFeignClient.getPersonCategoryList(formDTO); + if (!list.success()){ + throw new EpmetException("查询人员分类下人数失败..."); + } + List datas = list.getData(); + if (CollectionUtils.isNotEmpty(datas)){ + result.forEach( r -> datas.stream().filter( d -> d.getConfigId().equals(r.getId())).forEach(d -> r.setCount(d.getCount()))); + } + return result; } /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml index 68036233b5..8979fb442c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml @@ -15,9 +15,11 @@ sc.LABEL, sc.MANAGEMENT_ICON, sc.COLUMN_NAME, - sc.id AS id + sc.id AS id, + wc.ID AS warnConfigId FROM ic_individual_category_manage cm INNER JOIN ic_resi_category_stats_config sc ON (sc.ID = cm.COLUMN_ID AND sc.DEL_FLAG = '0' AND `STATUS` = 'show') + INNER JOIN ic_resi_category_warn_config wc ON (sc.COLUMN_NAME = wc.COLUMN_NAME AND wc.DEL_FLAG = '0' AND wc.CUSTOMER_ID = sc.CUSTOMER_ID) WHERE cm.DEL_FLAG = 0 AND cm.USER_ID = #{userId} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CategoryCountListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CategoryCountListFormDTO.java new file mode 100644 index 0000000000..86a236a47c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CategoryCountListFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/1/21 1:43 下午 + * @DESC + */ +@Data +public class CategoryCountListFormDTO implements Serializable { + + private static final long serialVersionUID = 1563081091285509142L; + + private List configList; + + private String orgId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CategoryCountListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CategoryCountListResultDTO.java new file mode 100644 index 0000000000..375cb1ad1e --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CategoryCountListResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/1/21 1:44 下午 + * @DESC + */ +@Data +public class CategoryCountListResultDTO implements Serializable { + + private static final long serialVersionUID = -8441192101441016588L; + + private String configId; + + private Integer count; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 1b9ac976c6..14377b7fe9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -710,6 +710,6 @@ public interface EpmetUserOpenFeignClient { Result resiRelationInfo(@RequestParam("userId")String userId); @PostMapping("/epmetuser/statsresiwarn/list2") - Result> getPersonCategoryList(@RequestBody StatsResiListFormDTO formDTO); + Result> getPersonCategoryList(@RequestBody CategoryCountListFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index bde8bf2e8c..5bd1aa581e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -524,7 +524,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result> getPersonCategoryList(StatsResiListFormDTO formDTO) { + public Result> getPersonCategoryList(CategoryCountListFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPersonCategoryList", formDTO); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java index 1be35d69b5..e02214518a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java @@ -22,9 +22,11 @@ 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; @@ -74,9 +76,8 @@ public class StatsResiWarnController { * @date 2022/1/20 2:11 下午 */ @PostMapping("list2") - public Result> list2(@RequestBody StatsResiListFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO); - return new Result>().ok(statsResiWarnService.list2(formDTO)); + public Result> list2(@RequestBody CategoryCountListFormDTO formDTO){ + return new Result>().ok(statsResiWarnService.list2(formDTO)); } @PostMapping("buildingwarnlist") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java index 941421fc33..2b8dcf8263 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java @@ -17,7 +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; @@ -39,7 +41,7 @@ public interface StatsResiWarnService{ List list(String customerId,String id, String level); - List list2(StatsResiListFormDTO formDTO); + List list2(CategoryCountListFormDTO formDTO); void resiWarn(String customerId); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java index 122fca634e..10710e8437 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java @@ -9,6 +9,8 @@ import com.epmet.dao.IcResiUserDao; import com.epmet.dao.IcStatsResiWarnDao; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiCategoryWarnConfigDTO; +import com.epmet.dto.PersonWarnLeftPieDTO; +import com.epmet.dto.form.CategoryCountListFormDTO; import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO; import com.epmet.dto.form.StatsResiListFormDTO; import com.epmet.dto.result.*; @@ -195,8 +197,15 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { } @Override - public List list2(StatsResiListFormDTO formDTO) { - return this.list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel()); + public List list2(CategoryCountListFormDTO formDTO) { + if (CollectionUtils.isEmpty(formDTO.getConfigList())){ + return new ArrayList<>(); + } + List result = icStatsResiWarnDao.selectCategoryCount(formDTO.getConfigList(), formDTO.getOrgId()); + if (CollectionUtils.isEmpty(result)){ + return new ArrayList<>(); + } + return ConvertUtils.sourceToTarget(result,CategoryCountListResultDTO.class); } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml index 683938f80e..b1a900968b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml @@ -136,7 +136,7 @@