工作人员禁用、编辑、网格添加移除人员、部门添加移除人员方法添加删除人员缓存逻辑，调通的奇峰加

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<String> selectedList;
 
+    //token中客户Id
+    private String customerId;
+
 }

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;
 }

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;
 }

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;
+
 }

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);
     }

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);
     }

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<CustomerGridDao, Cu
                     ? 0 : (authResult.getData().getTotalUser() - 1));
             update(grid);
 
+            //2021.8.24 sun 网格移除工作人员时删除工作人员的缓存信息
+            CustomerStaffRedis.delStaffInfoFormCache(staffInfoFormDTO.getCustomerId(), staffInfoFormDTO.getStaffId());
             return new Result();
         }
 
@@ -426,6 +429,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
                                validStaffIds.size() : authResult.getData().getTotalUser() + validStaffIds.size()
                 );
                 update(grid2Update);
+                //2021.8.24 sun 网格添加工作人员时删除工作人员的缓存信息
+                validStaffIds.forEach(staffId -> {
+                    CustomerStaffRedis.delStaffInfoFormCache(staffListFormDTO.getCustomerId(), staffId);
+                });
                 return new Result();
             }
 

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);

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;
 	}
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -446,6 +446,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		staffEntity.setId(customerStaffEntity.getId());
 		staffEntity.setEnableFlag(CustomerStaffConstant.DISABLED);
 		baseDao.updateById(staffEntity);
+		//2021.8.24 sun 人员禁用时删除工作人员的缓存信息
+		CustomerStaffRedis.delStaffInfoFormCache(fromDTO.getCustomerId(), fromDTO.getStaffId());
 		return new Result();
 	}