From 75bd0eb8bb1650d63fcd46f89ceb22138ce66cf0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 May 2022 08:51:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/model/ImportBuildingInfoListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 3b13b608a8..df4d9d3243 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -227,13 +227,14 @@ public class ImportBuildingInfoListener extends AnalysisEventListener Date: Mon, 9 May 2022 09:27:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java | 2 ++ .../com/epmet/model/ImportNeighborHoodInfoListener.java | 2 +- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 1 + .../src/main/resources/mapper/IcNeighborHoodDao.xml | 7 +++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index 6238d0f303..8d1a4865de 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -87,4 +87,6 @@ public interface IcNeighborHoodDao extends BaseDao { * @date 2022/4/28 09:10 */ void delProperty(@Param("neighborHoodIds")List neighborHoodIds); + + void updateOneNeighborHood(ImportGeneralDTO info); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java index a2581e8c48..0f351c6b4d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -109,7 +109,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener ) + + update ic_neighbor_hood + set ADDRESS = #{address}, + REMARK = #{remark}, + UPDATED_TIME = NOW() + where id = #{neighborHoodId} + From 601c85057c84972907ee1dd4b56554cb9fcb3ec1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 May 2022 10:55:22 +0800 Subject: [PATCH 3/5] sort default 0 --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 2 +- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 7387a73354..de7cbe99f1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -91,7 +91,7 @@ c.ORGANIZATION_NAME as agencyName, d.ID as gridId, d.GRID_NAME as gridName, - a.SORT as sort, + IFNULL(a.SORT,0) as sort, a.LONGITUDE as longitude, a.LATITUDE as latitude, a.TYPE as buildingTypeKey, diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 49472d0dc7..14ad186898 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -112,7 +112,7 @@ ag.ORGANIZATION_NAME agencyName, c.GRID_ID as gridId, gr.GRID_NAME, - a.sort + IFNULL(a.sort,0) as sort from ic_house a LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0' LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0' From f49151d47633f3865cbd34dabbcbb45095ebc57e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 May 2022 13:35:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/model/ImportNeighborHoodInfoListener.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java index 0f351c6b4d..5bacafb1fe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -88,12 +88,6 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener Date: Mon, 9 May 2022 13:55:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=A5=BC=E6=A0=8B=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index de7cbe99f1..4976a20114 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -51,6 +51,7 @@ BUILDING_LEADER_NAME = #{buildingLeaderName}, BUILDING_LEADER_MOBILE = #{buildingLeaderMobile}, SORT = #{sort}, + TYPE = #{type}, UPDATED_TIME = NOW() WHERE ID = #{buildingId}