From 9a5db5ac8aafcbf56bffc2c5c9f78590de1a9701 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Mar 2023 14:13:26 +0800 Subject: [PATCH] =?UTF-8?q?epmetuser/statsresiwarn/list=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E5=A4=9A=E4=B8=AA=E5=B0=8F=E5=8C=BA=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/StatsResiListFormDTO.java | 6 ++++++ .../com/epmet/controller/StatsResiWarnController.java | 2 +- .../src/main/java/com/epmet/dao/IcResiUserDao.java | 9 ++++++--- .../java/com/epmet/service/StatsResiWarnService.java | 2 +- .../com/epmet/service/impl/StatsResiWarnServiceImpl.java | 6 +++--- .../src/main/resources/mapper/IcResiUserDao.xml | 9 ++++++++- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiListFormDTO.java index 131322a8a6..986ff7e8f4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiListFormDTO.java @@ -21,6 +21,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** @@ -39,6 +40,11 @@ public class StatsResiListFormDTO implements Serializable { */ @NotBlank(message = "id不能为空") private String id; + /** + * 目前只支持传入小区id + * level：neighborHood + */ + private List idList; @NotBlank(message = "level不能为空") private String level; 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 3003dec607..6ce3e80c68 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 @@ -67,7 +67,7 @@ public class StatsResiWarnController { public Result> list(@LoginUser TokenDto tokenDto,@RequestBody StatsResiListFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); String customerId = tokenDto.getCustomerId(); - List icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel()); + List icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel(),formDTO.getIdList()); return new Result>().ok(icStatsResiResultDTOList); } 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 e6845fefd3..bb215e3734 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 @@ -19,7 +19,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; -import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcResiUserConfirmDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcVolunteerPolyDTO; @@ -278,8 +277,12 @@ public interface IcResiUserDao extends BaseDao { * @author LiuJanJun * @date 2022/2/12 3:03 下午 */ - Map getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName, - @Param("columnList") List columnList, @Param("id") String id, @Param("level") String level); + Map getDataAnalyseCount(@Param("customerId") String customerId, + @Param("tableName") String tableName, + @Param("columnList") List columnList, + @Param("id") String id, + @Param("level") String level, + @Param("idList")List idList); List> getIcUserList(@Param("customerId") String customerId, @Param("columns") List columns); 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 33a41f51a5..a6797fd444 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 @@ -58,7 +58,7 @@ public interface StatsResiWarnService{ PageData allUserWarnList(StatsResiWarnFormDTO formDTO); - List list(String customerId,String id, String level); + List list(String customerId,String id, String level,List idList); List list2(StatsResiListFormDTO formDTO); 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 cced7c95b1..b0ed6de3ce 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 @@ -243,7 +243,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { } @Override - public List list(String customerId,String id, String level) { + public List list(String customerId,String id, String level,List idList) { //获取所有配置类项 getshow IcResiCategoryStatsConfigFormDTO dto = new IcResiCategoryStatsConfigFormDTO(); dto.setStatus("show"); @@ -263,7 +263,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { }); Map> tableColumnCountMap = new HashMap<>(); paramMap.forEach((tableName,columnList) ->{ - Map countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level); + Map countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level,idList); if (countMap != null){ tableColumnCountMap.put(tableName,countMap); } @@ -287,7 +287,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { @Override public List list2(StatsResiListFormDTO formDTO) { - return list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel()); + return list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel(),null); } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 47bb9cd511..f958ee2ce9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -818,7 +818,14 @@ AND GRID_ID = #{id} - AND VILLAGE_ID = #{id} + + AND VILLAGE_ID = #{id} + + + + VILLAGE_ID = #{id} + + AND BUILD_ID = #{id}