From e3f5341957809cc47cba856fa44cdcea5470c3dd Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 24 Aug 2021 10:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=BB=E9=99=A4=E4=BA=BA=E5=91=98=E3=80=81?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=B7=BB=E5=8A=A0=E7=A7=BB=E9=99=A4=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BC=93=E5=AD=98=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E9=80=9A=E7=9A=84=E5=A5=87=E5=B3=B0=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java | 3 +++ .../epmet/dto/form/CommonDepartmentStaffInfoFormDTO.java | 3 +++ .../com/epmet/dto/form/CommonGridStaffInfoFormDTO.java | 3 +++ .../com/epmet/dto/form/CommonGridStaffListFromDTO.java | 3 +++ .../java/com/epmet/controller/DepartmentController.java | 2 ++ .../src/main/java/com/epmet/controller/GridController.java | 2 ++ .../com/epmet/service/impl/CustomerGridServiceImpl.java | 7 +++++++ .../java/com/epmet/service/impl/DepartmentServiceImpl.java | 6 ++++++ .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 2 ++ .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 2 ++ 10 files changed, 33 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java index cc23e60a92..cd09fb7035 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java @@ -28,4 +28,7 @@ public class AddDepartmentStaffFormDTO implements Serializable { @NotBlank(message = "选中人员不能为空") private List selectedList; + //token中客户Id + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonDepartmentStaffInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonDepartmentStaffInfoFormDTO.java index 9b08da473e..af27d1dd16 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonDepartmentStaffInfoFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonDepartmentStaffInfoFormDTO.java @@ -32,4 +32,7 @@ public class CommonDepartmentStaffInfoFormDTO implements Serializable { * */ @NotBlank(message = "用户Id不能为空") private String userId; + + //token中客户Id + private String customerId; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffInfoFormDTO.java index 8307f12258..1ea1f097c4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffInfoFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffInfoFormDTO.java @@ -32,4 +32,7 @@ public class CommonGridStaffInfoFormDTO implements Serializable{ * */ @NotBlank(message = "用户Id不能为空") private String userId; + + //token中客户Id + private String customerId; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffListFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffListFromDTO.java index 6342518664..9049339d69 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffListFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonGridStaffListFromDTO.java @@ -35,4 +35,7 @@ public class CommonGridStaffListFromDTO implements Serializable{ @NotBlank(message = "用户Id不能为空") private String userId; + //token中客户Id + private String customerId; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java index b4d02c5533..e0d76fc5b4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java @@ -39,6 +39,7 @@ public class DepartmentController { @PostMapping(value = "adddepartmentstaff") @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_ADD) public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){ + addDepartmentStaffFormDTO.setCustomerId(tokenDto.getCustomerId()); return departmentService.addDepartmentStaff(tokenDto,addDepartmentStaffFormDTO); } @@ -147,6 +148,7 @@ public class DepartmentController { @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_REMOVE) public Result removeStaff(@LoginUser TokenDto tokenDto,@RequestBody CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO){ departmentStaffInfoFormDTO.setUserId(tokenDto.getUserId()); + departmentStaffInfoFormDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(departmentStaffInfoFormDTO); return departmentService.removeStaff(departmentStaffInfoFormDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index a51b505b35..4940768e7d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -125,6 +125,7 @@ public class GridController { @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_STAFF_ADD) public Result addGridStaffs(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffListFromDTO commonGridStaffListFromDTO){ commonGridStaffListFromDTO.setUserId(tokenDto.getUserId()); + commonGridStaffListFromDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(tokenDto); return customerGridService.addGridStaffs(commonGridStaffListFromDTO); } @@ -141,6 +142,7 @@ public class GridController { @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_STAFF_REMOVE) public Result removeGridStaff(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffInfoFormDTO commonGridStaffInfoFormDTO){ commonGridStaffInfoFormDTO.setUserId(tokenDto.getUserId()); + commonGridStaffInfoFormDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(tokenDto); return customerGridService.removeGridStaff(commonGridStaffInfoFormDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 23de67608c..fd8be5cdbd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -364,6 +365,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl { + CustomerStaffRedis.delStaffInfoFormCache(staffListFormDTO.getCustomerId(), staffId); + }); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 41d87332ed..0ea2e30383 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; @@ -233,6 +234,8 @@ public class DepartmentServiceImpl implements DepartmentService { customerStaffDepartmentEntity.setCustomerId(customerIdDTO.getCustomerId()); customerStaffDepartmentEntity.setUserId(userId); customerStaffDepartmentDao.insert(customerStaffDepartmentEntity); + //2021.8.24 sun 部门添加工作人员时删除工作人员的缓存信息 + CustomerStaffRedis.delStaffInfoFormCache(addDepartmentStaffFormDTO.getCustomerId(), userId); } customerStaffDepartmentDao.updateDepartmentStaffCount(addDepartmentStaffFormDTO.getSelectedList().size(),addDepartmentStaffFormDTO.getDepartmentId()); return new Result(); @@ -266,6 +269,9 @@ public class DepartmentServiceImpl implements DepartmentService { ? 0 : dept.getTotalUser() - NumConstant.ONE); dept2Update.setUpdatedBy(departmentStaffInfoFormDTO.getUserId()); customerDepartmentService.update(dept2Update); + //2021.8.24 sun 部门移除工作人员时删除工作人员的缓存信息 + CustomerStaffRedis.delStaffInfoFormCache(departmentStaffInfoFormDTO.getCustomerId(), departmentStaffInfoFormDTO.getStaffId()); + return new Result(); } log.warn(ModuleConstant.DEPT_INFO_NOT_FOUND); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 811adc098c..b6dd8c9de8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -175,6 +175,8 @@ public class StaffServiceImpl implements StaffService { } return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg()); } + //2021.8.24 sun 人员信息编辑时删除工作人员的缓存信息 + CustomerStaffRedis.delStaffInfoFormCache(fromDTO.getCustomerId(), fromDTO.getStaffId()); return result; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 9405f9a4a9..740b4b8d6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -446,6 +446,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl