From 5509da011a0251c58446f3454dd9f9524d0729a6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 15 Apr 2022 18:35:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/BuildingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 58aa913cec..cadad656c8 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 @@ -539,7 +539,7 @@ public class BuildingServiceImpl implements BuildingService { Integer unit = icBuilding.getTotalUnitNum(); if(nowUnit units = icBuildingUnitService.getUnitOptions(icBuilding.getId()); From 15bfc8698722a9eb26f231ec23f16a3101bd22a8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 15 Apr 2022 22:15:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=A7=81=E6=9C=8D=E5=9C=B0=E5=9D=80=20=E5=8F=8A=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2a30af4cf9..ff15bf358e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,11 +97,6 @@ - public aliyun nexus @@ -110,6 +105,11 @@ true + + epmet + maven-releases + https://nexus.elinkservice.cn/repository/maven-releases/ + @@ -124,5 +124,11 @@ + + + epmet + https://nexus.elinkservice.cn/repository/maven-releases/ + + From c6af9dc7f6063ab879aec63f3001635893a75e6a Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 18 Apr 2022 10:10:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?dev=E5=90=88=E5=B9=B6=E4=B8=8B=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildingServiceImpl.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) 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 a04911ba6b..582058e657 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 @@ -553,29 +553,25 @@ public class BuildingServiceImpl implements BuildingService { if(nowUnit units = icBuildingUnitService.getUnitOptions(icBuilding.getId()); - Map unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel)); - List unitList = new ArrayList<>(); - for (int i = 1; i <= nowUnit; i++) { - String unitNum = String.valueOf(i); - if (!unitMap.containsKey(unitNum)) { - IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity(); - icBuildingUnit.setBuildingId(icBuilding.getId()); - icBuildingUnit.setCustomerId(customerId); - icBuildingUnit.setUnitName(unitNum + "单元"); - icBuildingUnit.setUnitNum(unitNum); - unitList.add(icBuildingUnit); - } - icBuildingUnitService.insertBatch(unitList); }else{ - //如果小于，判断是否存在房屋，如果存在就提示不能更改 - throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(),"楼栋单元下存在房屋，无法更新"); + //新增单元 + List units = icBuildingUnitService.getUnitOptions(icBuilding.getId()); + Map unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel)); + List unitList = new ArrayList<>(); + for (int i = 1; i <= nowUnit; i++) { + String unitNum = String.valueOf(i); + if (!unitMap.containsKey(unitNum)) { + IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity(); + icBuildingUnit.setBuildingId(icBuilding.getId()); + icBuildingUnit.setCustomerId(customerId); + icBuildingUnit.setUnitName(unitNum + "单元"); + icBuildingUnit.setUnitNum(unitNum); + unitList.add(icBuildingUnit); + } + icBuildingUnitService.insertBatch(unitList); + } } - - } /** From 345e2e7a9fb9b39167c0df419486256337b5df2b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 Apr 2022 10:23:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?bug#2803,=E4=BF=AE=E6=94=B9=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E5=90=8D=E5=90=8E=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=92=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/redis/common/CustomerIcHouseRedis.java | 4 ++++ .../src/main/java/com/epmet/redis/IcHouseRedis.java | 5 +++++ .../com/epmet/service/impl/BuildingServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/IcHouseDao.xml | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java index ec0a79f1db..6f2e4959e0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java @@ -62,4 +62,8 @@ public class CustomerIcHouseRedis { return buildInfoResult.getData(); } + public static void delBuildingInfo(String buildingId){ + String key = RedisKeys.getBuildingInfoKey(buildingId); + customerIcHouseRedis.redisUtils.delete(key); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java index 01792daf8c..63ff8d25e5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java @@ -90,6 +90,11 @@ public class IcHouseRedis { return houseInfo; } + public void delHouseInfo(String houseId,String customerId){ + String key = RedisKeys.getHouseInfoCacheKey(houseId,customerId); + redisUtils.delete(key); + } + /** * @Description 存放房屋临时缓存 * @param customerId 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 582058e657..58666a8d9d 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 @@ -17,6 +17,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -572,6 +573,16 @@ public class BuildingServiceImpl implements BuildingService { } } + //删除楼栋下所有的房屋缓存 + List houseList = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId())); + if (!CollectionUtils.isEmpty(houseList)) { + houseList.forEach(house -> { + //删除房屋的缓存 + icHouseRedis.delHouseInfo(house.getId(), customerId); + }); + } + //删除楼栋缓存 + CustomerIcHouseRedis.delBuildingInfo(formDTO.getBuildingId()); } /** 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 515b5df72f..4712160069 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 @@ -72,7 +72,7 @@