From ed89bff32ea16f7c06370294c9780ac2349fdfd4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 16 Jul 2022 11:47:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E6=A0=BCid=20=E6=98=AF=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC=E8=A7=A6?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NeighborHoodController.java | 2 +- .../controller/IcResiUserController.java | 3 +-- .../service/impl/IcResiUserServiceImpl.java | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index e01d8cba4b..ece90f219d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -99,7 +99,7 @@ public class NeighborHoodController { lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(tokenDTO.getCustomerId()), 120L, 3L, TimeUnit.SECONDS); neighborHoodService.updateNeighborhood(customerId,formDTO); } finally { - lock.unlock(); + distributedLock.unLock(lock); } return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index ddd53b88b9..6dfc6ae5c0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -49,7 +49,6 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.constant.OrgInfoConstant; import com.epmet.constant.SystemMessageType; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcResiUserDTO; @@ -261,7 +260,7 @@ public class IcResiUserController implements ResultDataResolver { this.sendVolunteerMsg(tokenDto.getCustomerId(), resiUserId); } finally { - lock.unlock(); + distributedLock.unLock(lock); } return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 546bd447c1..e6f89db6b9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -79,7 +79,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -2213,9 +2212,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl changeIcResiUserBelongTo(TokenDto tokenDto, IcUserBelongToChangedFormDTO formDTO) { - List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId()); + + if (StringUtils.isBlank(formDTO.getCustomerId())|| + StringUtils.isBlank(formDTO.getSourceGridId())||StringUtils.isBlank(formDTO.getTargetGridId()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误"); + } + IcResiUserEntity entity = new IcResiUserEntity(); + entity.setGridId(formDTO.getTargetGridId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getGridId,formDTO.getSourceGridId()); + baseDao.update(entity,wrapper); + //不调用原来的更新居民了 太慢 + /*List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId()); if (CollectionUtils.isEmpty(resiUserIdList)) { return null; } @@ -2234,8 +2245,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Sat, 16 Jul 2022 11:53:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E6=A0=BCid=20=E6=98=AF=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC=E8=A7=A6?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index e6f89db6b9..b5f4ae2efe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2223,7 +2223,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getGridId,formDTO.getSourceGridId()); + wrapper.eq(IcResiUserEntity::getGridId,formDTO.getSourceGridId()) + .eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId()); baseDao.update(entity,wrapper); //不调用原来的更新居民了 太慢 /*List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId()); From ef48136aea447572215dfabe4b418fd343d0c02f Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 16 Jul 2022 11:59:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E6=A0=BCid=20=E6=98=AF=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC=E8=A7=A6?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index b5f4ae2efe..7a28f47eaf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2216,8 +2216,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl changeIcResiUserBelongTo(TokenDto tokenDto, IcUserBelongToChangedFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getCustomerId())|| - StringUtils.isBlank(formDTO.getSourceGridId())||StringUtils.isBlank(formDTO.getTargetGridId()){ + if (StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getSourceGridId()) + ||StringUtils.isBlank(formDTO.getTargetGridId())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误"); } IcResiUserEntity entity = new IcResiUserEntity();