From 10a100858dcec61496da6e8e363772b548e00b1b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 13 Apr 2022 10:27:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?/epmetuser/statsresiwarn/list=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=97=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcStatsResiResultDTO.java | 5 ++++- .../com/epmet/service/impl/StatsResiWarnServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiResultDTO.java index 4f670770f3..beacf24482 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiResultDTO.java +++ b/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; } \ No newline at end of file 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 aca5ac654b..0a187604a7 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 @@ -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 orDefault = tableColumnCountMap.getOrDefault(item.getTableName(), new HashMap<>()); From 1f5df47a002260982ad53dd32481f4ae02bd8b3e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 13 Apr 2022 10:34:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.16__add_index_ic_house.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.16__add_index_ic_house.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.16__add_index_ic_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.16__add_index_ic_house.sql new file mode 100644 index 0000000000..3bf8ad31eb --- /dev/null +++ b/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';