From 3063afb3a0090891a16a70239f6e996beeee9539 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 8 Nov 2021 16:24:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E5=AE=B6=E5=BA=AD=20=E6=9F=A5=E8=AF=A2=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 8 ++++---- .../java/com/epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../java/com/epmet/controller/IcResiUserController.java | 6 +++--- .../src/main/java/com/epmet/dao/IcResiUserDao.java | 2 +- .../main/java/com/epmet/service/IcResiUserService.java | 4 ++-- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 2858eb6d31..0dbfa5796a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -191,21 +191,21 @@ public class IcHouseServiceImpl extends BaseServiceImpl>> resultMap = epmetUserOpenFeignClient.getHomeUserCategoryCount(userDTO); + Result>> resultMap = epmetUserOpenFeignClient.getHomeUserCategoryCount(userDTO); if (!resultMap.success()) { throw new RenException(resultMap.getCode(), resultMap.getMsg()); } - Map> map = resultMap.getData(); + Map> map = resultMap.getData(); return list.stream().map(item -> { - Map countMap = map.get(item.getId()); + Map countMap = map.get(item.getId()); HouseListResultDTO dto = new HouseListResultDTO(); dto.setHouseId(item.getId()); dto.setHouseName(item.getHouseName()); List 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) { + if (null == countMap.get(category.getColumnName()) || NumConstant.ZERO_STR.equals(countMap.get(category.getColumnName()))) { continue; } HouseListResultDTO.CategoryListBean bean = new HouseListResultDTO.CategoryListBean(); 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 26fe630e6e..5637b6b765 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 @@ -652,5 +652,5 @@ public interface EpmetUserOpenFeignClient { Result> getDemandOptions(); @PostMapping("/epmetuser/icresiuser/categorycount") - Result>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO); + Result>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index d1fa95e43a..24c8b5b5fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -346,13 +346,13 @@ public class IcResiUserController { /** * @Description 获取一栋楼每个房间人员分类的数量 * @Param formDTO - * @Return {@link Result< Map< String, Map< String, Integer>>>} + * @Return {@link Result< Map< String, Map< String, String>>>} * @Author zhaoqifeng * @Date 2021/11/5 15:10 */ @PostMapping("categorycount") - public Result>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO) { - return new Result>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId())); + public Result>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO) { + return new Result>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId())); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index c3ed3df1f9..db7344b6ea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -123,7 +123,7 @@ public interface IcResiUserDao extends BaseDao { String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set codeSet); @MapKey("HOME_ID") - Map> getHomeUserCategoryCount(@Param("buildId") String buildId); + Map> getHomeUserCategoryCount(@Param("buildId") String buildId); /** * @Description 根据userId查询志愿者 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 76a6a24618..0f82258bf0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -125,9 +125,9 @@ public interface IcResiUserService extends BaseService { /** * @Description 获取一栋楼每个房间人员分类的数量 * @Param buildId - * @Return {@link Map< String, Map< String, Integer>>} + * @Return {@link Map< String, Map< String, String>>} * @Author zhaoqifeng * @Date 2021/11/5 14:40 */ - Map> getHomeUserCategoryCount(String buildId); + Map> getHomeUserCategoryCount(String buildId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 0ad386f461..d91d541047 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -759,12 +759,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl>} + * @Return {@link Map>} * @Author zhaoqifeng * @Date 2021/11/5 14:40 */ @Override - public Map> getHomeUserCategoryCount(String buildId) { + public Map> getHomeUserCategoryCount(String buildId) { return baseDao.getHomeUserCategoryCount(buildId); } }