Browse Source

Merge remote-tracking branch 'remotes/origin/dev'

dev
jianjun 3 years ago
parent
commit
d99cb1ee8b
  1. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java

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

@ -376,7 +376,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
continue; continue;
} }
String categoryName = StringUtils.isBlank(configMap.get(dto.getConfigId())) ? StrConstant.EPMETY_STR : configMap.get(dto.getConfigId()); String categoryName = StringUtils.isBlank(configMap.get(dto.getConfigId())) ? StrConstant.EPMETY_STR : configMap.get(dto.getConfigId());
dto.setNoticeContent(String.format("%s%s%s【%s】超出预警!", infoCache.getGridName(), infoCache.getNeighborHoodName(), infoCache.getBuildingName(), categoryName)); dto.setNoticeContent(String.format("%s-%s%s【%s】超出预警!", infoCache.getGridName(), infoCache.getNeighborHoodName(), infoCache.getBuildingName(), categoryName));
resList.add(dto); resList.add(dto);
} }
return resList; return resList;

Loading…
Cancel
Save