Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.16__add_index_ic_house.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `epmet_gov_org`.`ic_house`
+    ADD INDEX `idx_building_id`(`BUILDING_ID`) USING BTREE COMMENT '楼宇id',
+    ADD INDEX `idx_hood_id`(`NEIGHBOR_HOOD_ID`) USING BTREE COMMENT '小区id';

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiResultDTO.java

@@ -40,5 +40,8 @@ public class IcStatsResiResultDTO implements Serializable {
 	private String managementIcon;
 	private String dataIcon;
 	private String houseShowIcon;
-
+	/**
+	 * 列名
+	 */
+	private String columnName;
 }

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

@@ -238,6 +238,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
             resultDTO.setDataIcon(item.getDataIcon());
             resultDTO.setHouseShowIcon(item.getHouseShowIcon());
             resultDTO.setManagementIcon(item.getManagementIcon());
+            resultDTO.setColumnName(item.getColumnName());
             //根据id ，level 获取count
             //Integer count = icStatsResiWarnDao.countListByLevelAndCol(customerId,item.getTableName(),item.getColumnName(),id,level);
             Map<String, BigDecimal> orDefault = tableColumnCountMap.getOrDefault(item.getTableName(), new HashMap<>());