REQ-2633-添加根据id更新saas_role_user数据接口

tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java

@@ -2,6 +2,7 @@ package cn.axzo.tyr.client.feign;
 
 import cn.axzo.framework.domain.web.result.ApiPageResult;
 import cn.axzo.framework.domain.web.result.ApiResult;
+import cn.axzo.tyr.client.model.roleuser.RoleUserUpdateReq;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserAutoOwnRoleResp;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserFeatureResourceIdsResp;
 import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserDTO;
@@ -127,4 +128,12 @@ public interface TyrSaasRoleUserApi {
      */
     @PostMapping("/api/saas-role-user/get-user-feature-resource-ids")
     ApiResult<GetUserFeatureResourceIdsResp> getUserFeatureResourceIds(@RequestBody @Valid GetUserFeatureResourceIdsReq req);
+
+    /**
+     * 根据id更新数据
+     * @param roleUserUpdateReqs 参数列表
+     * @return
+     */
+    @PostMapping("/api/saas-role-user/batch-update-by-id")
+    ApiResult<Boolean> batchUpdateById(List<RoleUserUpdateReq> roleUserUpdateReqs);
 }

tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/RoleUserUpdateReq.java

@@ -0,0 +1,22 @@
+package cn.axzo.tyr.client.model.roleuser;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class RoleUserUpdateReq {
+
+    @NotNull(message = "id不能为空")
+    @Min(value = 0L)
+    private Long id;
+
+    private Long identityId;
+}

tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SaasRoleUserV2DTO.java

@@ -11,6 +11,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class SaasRoleUserV2DTO {
 
+    private Long id;
+
     /**
      * 角色Id
      */

tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java

@@ -6,6 +6,7 @@ import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.feign.TyrSaasRoleUserApi;
 import cn.axzo.tyr.client.model.enums.IdentityType;
+import cn.axzo.tyr.client.model.roleuser.RoleUserUpdateReq;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserAutoOwnRoleResp;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserFeatureResourceIdsResp;
 import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserDTO;
@@ -174,4 +175,9 @@ public class RoleUserController implements TyrSaasRoleUserApi {
     public ApiResult<GetUserFeatureResourceIdsResp> getUserFeatureResourceIds(GetUserFeatureResourceIdsReq req) {
         return ApiResult.ok(saasRoleUserService.getUserFeatureResourceIds(req));
     }
+
+    @Override
+    public ApiResult<Boolean> batchUpdateById(List<RoleUserUpdateReq> roleUserUpdateReqs) {
+        return ApiResult.ok(saasRoleUserService.batchUpdateById(roleUserUpdateReqs));
+    }
 }

tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java

@@ -1,6 +1,7 @@
 package cn.axzo.tyr.server.service;
 
 import cn.axzo.tyr.client.model.enums.IdentityType;
+import cn.axzo.tyr.client.model.roleuser.RoleUserUpdateReq;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserAutoOwnRoleResp;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserFeatureResourceIdsResp;
 import cn.axzo.tyr.client.model.roleuser.dto.SuperAminInfoResp;
@@ -106,4 +107,11 @@ public interface SaasRoleUserService {
      * @return
      */
     GetUserFeatureResourceIdsResp getUserFeatureResourceIds(GetUserFeatureResourceIdsReq req);
+
+    /**
+     * 根据id更新saas_role_user_relation数据
+     * @param roleUserUpdateReqs 请求参数
+     * @return
+     */
+    Boolean batchUpdateById(List<RoleUserUpdateReq> roleUserUpdateReqs);
 }

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java

@@ -1,5 +1,6 @@
 package cn.axzo.tyr.server.service.impl;
 
+import cn.axzo.basics.common.BeanMapper;
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.basics.common.exception.ServiceException;
 import cn.axzo.basics.common.util.AssertUtil;
@@ -11,6 +12,7 @@ import cn.axzo.tyr.client.model.BaseWorkspaceModel;
 import cn.axzo.tyr.client.model.enums.DictWorkSpaceTypeEnum;
 import cn.axzo.tyr.client.model.enums.IdentityType;
 import cn.axzo.tyr.client.model.enums.WorkerLeaderRoleEnum;
+import cn.axzo.tyr.client.model.roleuser.RoleUserUpdateReq;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserAutoOwnRoleResp;
 import cn.axzo.tyr.client.model.roleuser.dto.GetUserFeatureResourceIdsResp;
 import cn.axzo.tyr.client.model.roleuser.dto.IdentityInfo;
@@ -638,4 +640,13 @@ public class RoleUserService implements SaasRoleUserService {
         }
         return existsPgroupPermissionRelations.stream().filter(e -> !featureIds.contains(e.getFeatureId())).map(SaasPgroupPermissionRelation::getId).collect(Collectors.toSet());
     }
+
+    @Override
+    public Boolean batchUpdateById(List<RoleUserUpdateReq> roleUserUpdateReqs) {
+        if (CollectionUtils.isEmpty(roleUserUpdateReqs)) {
+            return false;
+        }
+        List<SaasRoleUserRelation> saasRoleUserDTOList = BeanMapper.copyList(roleUserUpdateReqs, SaasRoleUserRelation.class);
+        return roleUserRelationDao.updateBatchById(saasRoleUserDTOList);
+    }
 }

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java

@@ -185,6 +185,7 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl<SaasRoleUserRel
                                    Map<Long, SaasRoleUserV2DTO.SaasRoleUser> saasRoleUsers) {
 
         return SaasRoleUserV2DTO.builder()
+                .id(saasRoleUserRelation.getId())
                 .roleId(saasRoleUserRelation.getRoleId())
                 .saasRoleUser(saasRoleUsers.get(saasRoleUserRelation.getNaturalPersonId()))
                 .build();