From ff2850d132832203c36845ec369ae5943e10ac96 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 24 Apr 2022 09:08:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=9B=9Ecode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/redis/common/bean/GridInfoCache.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java index 63114e5794..c55e61513e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java @@ -118,4 +118,20 @@ public class GridInfoCache implements Serializable { * 弃用标记 */ private Integer abandonFlag; + + /** + * 网格编码 + */ + private String code; + + /** + * 负责人姓名 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; + } From 7a9d5a25c8f4cd124a8d1c6f3b9c4d4ca93d10c1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 26 Apr 2022 13:54:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=88=BF=E5=B1=8B=E5=90=8D?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/BuildingController.java | 1 - .../src/main/java/com/epmet/dao/IcHouseDao.java | 8 ++++++++ .../com/epmet/service/impl/BuildingServiceImpl.java | 3 +++ .../src/main/resources/mapper/IcHouseDao.xml | 11 +++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index fca09fe069..9c6e8069a4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -99,7 +99,6 @@ public class BuildingController { //效验数据 ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; buildingService.updateBuilding(customerId,formDTO); return new Result().ok("修改成功"); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index c5a392e6ca..6349e07111 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -92,4 +92,12 @@ public interface IcHouseDao extends BaseDao { */ void houseUpdate(@Param("houses") List houses); + /** + * Desc: 根据楼栋ID修改房屋名 + * @param buildingId + * @author zxc + * @date 2022/4/26 13:49 + */ + void houseUpdateHouseName(@Param("buildingId")String buildingId); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index cadad656c8..a5e93e42b6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -533,6 +533,9 @@ public class BuildingServiceImpl implements BuildingService { icBuildingDTO.setId(formDTO.getBuildingId()); icBuildingDTO.setCustomerId(customerId); icBuildingService.update(icBuildingDTO); + + // 更新房屋名称 + icHouseDao.houseUpdateHouseName(formDTO.getBuildingId()); //更新楼宇单元 //如果楼宇单元大于之前的楼宇单元，新增单元 Integer nowUnit= formDTO.getTotalUnitNum(); 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 0db3dfa93e..0bf46446b2 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 @@ -70,6 +70,17 @@ ) + + + UPDATE ic_house h,ic_building b,ic_building_unit u + SET h.HOUSE_NAME = CONCAT(b.BUILDING_NAME,'-',u.UNIT_NAME,'-',h.DOOR_NAME), + h.UPDATED_TIME = NOW() + WHERE h.DEL_FLAG = '0' + AND h.BUILDING_ID = b.ID AND b.DEL_FLAG = '0' + AND h.BUILDING_UNIT_ID = u.ID AND u.DEL_FLAG = '0' + AND h.BUILDING_ID = #{buildingId} + +