新增、编辑人员新增数字社区角色

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.form.ListOpePermsFormDTO;
+import com.epmet.dto.form.RoleUserFormDTO;
 import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,4 +30,14 @@ public interface GovAccessFeignClient {
      */
     @PostMapping("/gov/access/access/listoperationpermissions")
     Result<Set<String>> listOperationPermissions(@RequestBody ListOpePermsFormDTO listOpePermsFormDTO);
+
+    /**
+     * Desc: 保存角色
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/12 16:14
+     */
+    @PostMapping("/gov/access/govroleuser/roleUser")
+    Result roleUser(@RequestBody RoleUserFormDTO formDTO);
+
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.form.ListOpePermsFormDTO;
+import com.epmet.dto.form.RoleUserFormDTO;
 import com.epmet.feign.GovAccessFeignClient;
 
 import java.util.Set;
@@ -26,4 +27,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient {
     public Result<Set<String>> listOperationPermissions(ListOpePermsFormDTO listOpePermsFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationPermissions", listOpePermsFormDTO);
     }
+
+    @Override
+    public Result roleUser(RoleUserFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "roleUser", formDTO);
+    }
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.GovRoleUserDTO;
+import com.epmet.dto.form.RoleUserFormDTO;
 import com.epmet.service.GovRoleUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -129,4 +130,16 @@ public class GovRoleUserController {
         return new Result();
     }
 
+    /**
+     * Desc: 保存角色
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/12 16:14
+     */
+    @PostMapping("roleUser")
+    public Result roleUser(@RequestBody RoleUserFormDTO formDTO){
+        govRoleUserService.roleUser(formDTO);
+        return new Result();
+    }
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GovRoleUserDTO;
+import com.epmet.dto.form.RoleUserFormDTO;
 import com.epmet.entity.GovRoleUserEntity;
 
 import java.util.List;
@@ -130,4 +131,12 @@ public interface GovRoleUserService extends BaseService<GovRoleUserEntity> {
      * @param userIds 用户ids
      */
     void deleteByUserIds(String[] userIds);
+
+    /**
+     * Desc: 保存角色
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/12 16:14
+     */
+    void roleUser(RoleUserFormDTO formDTO);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.GovRoleUserDao;
 import com.epmet.dto.GovRoleUserDTO;
+import com.epmet.dto.form.RoleUserFormDTO;
 import com.epmet.entity.GovRoleUserEntity;
 import com.epmet.redis.GovRoleUserRedis;
 import com.epmet.service.GovRoleUserService;
@@ -33,7 +34,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -153,4 +156,26 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl<GovRoleUserDao, GovR
         govRoleUserDao.deleteByUserIds(userIds);
     }
 
+    /**
+     * Desc: 保存角色
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/12 16:14
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void roleUser(RoleUserFormDTO formDTO) {
+        baseDao.deleteByUserId(formDTO.getUserId());
+        if (!CollectionUtils.isEmpty(formDTO.getRoleIds())){
+            List<GovRoleUserEntity> entityList = new ArrayList<>();
+            formDTO.getRoleIds().forEach(r -> {
+                GovRoleUserEntity entity = new GovRoleUserEntity();
+                entity.setUserId(formDTO.getUserId());
+                entity.setRoleId(r);
+                entityList.add(entity);
+            });
+            insertBatch(entityList);
+        }
+    }
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java

@@ -71,4 +71,6 @@ public class AddStaffV2FromDTO implements Serializable {
 	 * 来源client(PC端:web、微信小程序:wxmp)
 	 */
 	private String client;
+
+	private List<String> newRoles;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java

@@ -66,4 +66,6 @@ public class StaffSubmitFromDTO implements Serializable {
 	 * 来源client(PC端:web、微信小程序:wxmp)
 	 */
 	private String client;
+
+	private List<String> newRoles;
 }

epmet-module/gov-org/gov-org-server/pom.xml

@@ -18,6 +18,11 @@
             <artifactId>gov-org-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-access-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>oper-crm-client</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 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.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -78,6 +79,8 @@ public class StaffServiceImpl implements StaffService {
 	private CustomerStaffRedis customerStaffRedis;
 	@Resource
 	private StaffOrgRelationDao staffOrgRelationDao;
+	@Autowired
+	private GovAccessFeignClient govAccessFeignClient;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -190,6 +193,12 @@ public class StaffServiceImpl implements StaffService {
 			}
 			return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg());
 		}
+		if (CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){
+			Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId()));
+			if (!roleUserAccess.success()){
+				throw new EpmetException("save data to gov-role-user failure");
+			}
+		}
 		//2021.8.24 sun 人员信息编辑时删除工作人员的缓存信息
 		CustomerStaffRedis.delStaffInfoFormCache(fromDTO.getCustomerId(), fromDTO.getStaffId());
 		return result;
@@ -578,6 +587,13 @@ public class StaffServiceImpl implements StaffService {
 		staffOrgRelationEntity.setOrgType(fromDTO.getOrgType());
 		staffOrgRelationService.insert(staffOrgRelationEntity);
 
+		if (CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){
+			Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), customerStaffAgencyEntity.getUserId()));
+			if (!roleUserAccess.success()){
+				throw new EpmetException("save data to gov-role-user failure");
+			}
+		}
+
 		return new Result();
 	}