diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java index efd18fb2c6..c540ac1723 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.dao.IcStatsResiWarnDao; import com.epmet.dto.IcResiCategoryWarnConfigDTO; import com.epmet.dto.IcStatsResiWarnDTO; import com.epmet.dto.PersonWarnLeftPieDTO; +import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; import com.epmet.dto.result.PersonWarnLeftPieResultDTO; import com.epmet.entity.IcStatsResiWarnEntity; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -126,7 +127,7 @@ public class IcStatsResiWarnServiceImpl extends BaseServiceImpl> listResult = operCustomizeOpenFeignClient.resiCategoryWarnList(tokenDto.getCustomerId()); + Result> listResult = operCustomizeOpenFeignClient.getCustomerCategoryShowAndWarnList(tokenDto.getCustomerId()); if (!listResult.success()){ throw new EpmetException("查询设置预警的分类失败..."); } @@ -134,16 +135,16 @@ public class IcStatsResiWarnServiceImpl extends BaseServiceImpl configList = listResult.getData(); + List configList = listResult.getData(); List list = new ArrayList<>(); configList.forEach(c -> { PersonWarnLeftPieResultDTO.PersonWarnLeftPie p = new PersonWarnLeftPieResultDTO.PersonWarnLeftPie(); p.setTypeName(c.getLabel()); p.setTypeCode(c.getColumnName()); - p.setConfigId(c.getId()); + p.setConfigId(c.getWarnConfigId()); list.add(p); }); - List dtos = baseDao.selectCategoryCount(configList.stream().map(m -> m.getId()).collect(Collectors.toList()), staffInfo.getAgencyId()); + List dtos = baseDao.selectCategoryCount(configList.stream().map(m -> m.getWarnConfigId()).collect(Collectors.toList()), staffInfo.getAgencyId()); if (CollectionUtils.isNotEmpty(dtos)){ list.forEach(l -> dtos.stream().filter(d -> d.getConfigId().equals(l.getConfigId())).forEach(d -> l.setTypeCount(d.getCount()))); }