用户服务相关接口

yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelProjectRoleController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelProjectRoleService;
+import com.yd.user.feign.client.relprojectrole.ApiRelProjectRoleFeignClient;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListAddRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListPageRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleSelectPageRequest;
+import com.yd.user.feign.response.relprojectrole.ApiRelProjectRoleListPageResponse;
+import com.yd.user.feign.response.relprojectrole.ApiRelProjectRoleSelectPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.validation.constraints.NotNull;
+
 /**
 /**
- * <p>
- * 项目-角色关系表（正常来说一对多，加关系表方便扩展） 前端控制器
- * </p>
+ * 项目-角色关系信息（项目管理-角色配置）
  *
  *
  * @author zxm
  * @author zxm
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
 @RequestMapping("/relProjectRole")
 @RequestMapping("/relProjectRole")
-public class RelProjectRoleController {
+@Validated
+public class ApiRelProjectRoleController implements ApiRelProjectRoleFeignClient {
+
+    @Autowired
+    private ApiRelProjectRoleService apiRelProjectRoleService;
+
+    /**
+     * 项目和角色关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectRoleListPageResponse>> page(ApiRelProjectRoleListPageRequest request) {
+        return apiRelProjectRoleService.page(request);
+    }
+
+    /**
+     * 添加项目和角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addRoleList(ApiRelProjectRoleListAddRequest request) {
+        return apiRelProjectRoleService.addRoleList(request);
+    }
+
+    /**
+     * 删除项目和角色关系
+     * @param id 项目和角色关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        return apiRelProjectRoleService.del(id);
+    }
 
 
+    /**
+     * 导入-选择角色分页查询（查询当前项目级（当前所属项目绑定的角色）或者系统级（全局角色在任何地方都适用导入绑定）的角色表数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectRoleSelectPageResponse>> selectRolePage(ApiRelProjectRoleSelectPageRequest request) {
+        return apiRelProjectRoleService.selectRolePage(request);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelProjectUserController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelProjectUserService;
+import com.yd.user.feign.client.relprojectuser.ApiRelProjectUserFeignClient;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListAddRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListPageRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserSelectPageRequest;
+import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserListPageResponse;
+import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserSelectPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
- * <p>
- * 项目-用户关系表（多对多关系） 前端控制器
- * </p>
+ * 项目-用户关系信息（项目管理-用户配置）
  *
  *
  * @author zxm
  * @author zxm
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
 @RequestMapping("/relProjectUser")
 @RequestMapping("/relProjectUser")
-public class RelProjectUserController {
+@Validated
+public class ApiRelProjectUserController implements ApiRelProjectUserFeignClient {
 
 
+    @Autowired
+    private ApiRelProjectUserService apiRelProjectUserService;
+
+    /**
+     * 项目和用户关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectUserListPageResponse>> page(ApiRelProjectUserListPageRequest request) {
+        return apiRelProjectUserService.page(request);
+    }
+
+    /**
+     * 添加项目和用户列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addUserList(ApiRelProjectUserListAddRequest request) {
+        return apiRelProjectUserService.addUserList(request);
+    }
+
+    /**
+     * 删除项目和用户关系
+     * @param id 项目和用户关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        return apiRelProjectUserService.del(id);
+    }
+
+    /**
+     * 导入-选择用户分页查询（查询用户库的用户id不在当前项目用户关系的用户id列表中的数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectUserSelectPageResponse>> selectUserPage(ApiRelProjectUserSelectPageRequest request) {
+        return apiRelProjectUserService.selectUserPage(request);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelTenantMenuController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelTenantMenuService;
+import com.yd.user.feign.client.reltenantmenu.ApiRelTenantMenuFeignClient;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListAddRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListPageRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuSelectPageRequest;
+import com.yd.user.feign.response.reltenantmenu.ApiRelTenantMenuListPageResponse;
+import com.yd.user.feign.response.reltenantmenu.ApiRelTenantMenuSelectPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.validation.constraints.NotNull;
+
 /**
 /**
- * <p>
- * 租户-菜单关系表（正常来说一对多，加关系表方便扩展） 前端控制器
- * </p>
+ * 租户-菜单关系信息（租户管理-菜单配置）
  *
  *
  * @author zxm
  * @author zxm
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
 @RequestMapping("/relTenantMenu")
 @RequestMapping("/relTenantMenu")
-public class RelTenantMenuController {
+@Validated
+public class ApiRelTenantMenuController implements ApiRelTenantMenuFeignClient {
+
+    @Autowired
+    private ApiRelTenantMenuService apiRelTenantMenuService;
+
+    /**
+     * 租户和菜单关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantMenuListPageResponse>> page(ApiRelTenantMenuListPageRequest request) {
+        return apiRelTenantMenuService.page(request);
+    }
+
+    /**
+     * 添加租户和菜单列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addMenuList(ApiRelTenantMenuListAddRequest request) {
+        return apiRelTenantMenuService.addMenuList(request);
+    }
+
+    /**
+     * 删除租户和菜单关系
+     * @param id 租户和菜单关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        return apiRelTenantMenuService.del(id);
+    }
 
 
+    /**
+     * 导入-选择菜单分页查询（查询当前租户级（当前所属租户绑定的菜单）或者系统级（全局菜单在任何地方都适用导入绑定）的菜单表数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantMenuSelectPageResponse>> selectMenuPage(ApiRelTenantMenuSelectPageRequest request) {
+        return apiRelTenantMenuService.selectMenuPage(request);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelTenantProjectController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelTenantProjectService;
+import com.yd.user.feign.client.reltenantproject.ApiRelTenantProjectFeignClient;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
- * <p>
- * 租户-项目关系表（正常来说一对多，加关系表方便扩展） 前端控制器
- * </p>
+ * 租户-项目关系信息（租户管理-项目配置）
  *
  *
  * @author zxm
  * @author zxm
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
 @RequestMapping("/relTenantProject")
 @RequestMapping("/relTenantProject")
-public class ApiRelTenantProjectController {
+@Validated
+public class ApiRelTenantProjectController implements ApiRelTenantProjectFeignClient {
 
 
+    @Autowired
+    private ApiRelTenantProjectService apiRelTenantProjectService;
+
+    /**
+     * 租户和项目关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantProjectListPageResponse>> page(ApiRelTenantProjectListPageRequest request) {
+        return apiRelTenantProjectService.page(request);
+    }
+
+    /**
+     * 添加租户和项目列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addProjectList(ApiRelTenantProjectListAddRequest request) {
+        return apiRelTenantProjectService.addProjectList(request);
+    }
+
+    /**
+     * 删除租户和项目关系
+     * @param id 租户和项目关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        return apiRelTenantProjectService.del(id);
+    }
+
+    /**
+     * 导入-选择项目分页查询（查询当前租户级（当前所属租户绑定的项目）或者系统级（全局项目在任何地方都适用导入绑定）的项目表数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantProjectSelectPageResponse>> selectProjectPage(ApiRelTenantProjectSelectPageRequest request) {
+        return apiRelTenantProjectService.selectProjectPage(request);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelTenantRoleController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelTenantRoleService;
+import com.yd.user.feign.client.reltenantrole.ApiRelTenantRoleFeignClient;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListAddRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListPageRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleSelectPageRequest;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleListPageResponse;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleSelectPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
- * <p>
- * 租户-角色关系表（正常来说一对多，加关系表方便扩展） 前端控制器
- * </p>
+ * 租户-角色关系信息（租户管理-角色配置）
  *
  *
  * @author zxm
  * @author zxm
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
 @RequestMapping("/relTenantRole")
 @RequestMapping("/relTenantRole")
-public class RelTenantRoleController {
+@Validated
+public class ApiRelTenantRoleController implements ApiRelTenantRoleFeignClient {
 
 
+    @Autowired
+    private ApiRelTenantRoleService apiRelTenantRoleService;
+
+    /**
+     * 租户和角色关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantRoleListPageResponse>> page(ApiRelTenantRoleListPageRequest request) {
+        return apiRelTenantRoleService.page(request);
+    }
+
+    /**
+     * 添加租户和角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addRoleList(ApiRelTenantRoleListAddRequest request) {
+        return apiRelTenantRoleService.addRoleList(request);
+    }
+
+    /**
+     * 删除租户和角色关系
+     * @param id 租户和角色关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        return apiRelTenantRoleService.del(id);
+    }
+
+    /**
+     * 导入-选择角色分页查询（查询当前租户级（当前所属租户绑定的角色）或者系统级（全局角色在任何地方都适用导入绑定）的角色表数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantRoleSelectPageResponse>> selectRolePage(ApiRelTenantRoleSelectPageRequest request) {
+        return apiRelTenantRoleService.selectRolePage(request);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelTenantUserController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelTenantUserService;
+import com.yd.user.feign.client.reltenantuser.ApiRelTenantUserFeignClient;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListAddRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListPageRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserSelectPageRequest;
+import com.yd.user.feign.response.reltenantuser.ApiRelTenantUserListPageResponse;
+import com.yd.user.feign.response.reltenantuser.ApiRelTenantUserSelectPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.validation.constraints.NotNull;
+
 /**
 /**
- * <p>
- * 租户-用户关系表（多对多关系） 前端控制器
- * </p>
+ * 租户-用户关系信息（租户管理-用户配置）
  *
  *
  * @author zxm
  * @author zxm
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
 @RequestMapping("/relTenantUser")
 @RequestMapping("/relTenantUser")
-public class RelTenantUserController {
+@Validated
+public class ApiRelTenantUserController implements ApiRelTenantUserFeignClient {
+
+    @Autowired
+    private ApiRelTenantUserService apiRelTenantUserService;
+
+    /**
+     * 租户和用户关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantUserListPageResponse>> page(ApiRelTenantUserListPageRequest request) {
+        return apiRelTenantUserService.page(request);
+    }
+
+    /**
+     * 添加租户和用户列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addUserList(ApiRelTenantUserListAddRequest request) {
+        return apiRelTenantUserService.addUserList(request);
+    }
+
+    /**
+     * 删除租户和用户关系
+     * @param id 租户和用户关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        return apiRelTenantUserService.del(id);
+    }
 
 
+    /**
+     * 导入-选择用户分页查询（查询用户库的用户id不在当前租户用户关系的用户id列表中的数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantUserSelectPageResponse>> selectUserPage(ApiRelTenantUserSelectPageRequest request) {
+        return apiRelTenantUserService.selectUserPage(request);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelUserRoleController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelUserRoleService;
+import com.yd.user.feign.client.reluserrole.ApiRelUserRoleFeignClient;
+import com.yd.user.feign.request.reluserrole.ApiProjectUserRoleListAddRequest;
+import com.yd.user.feign.request.reluserrole.ApiTenantUserRoleListAddRequest;
+import com.yd.user.feign.response.reluserrole.ApiSelectedProjectUserRoleListResponse;
+import com.yd.user.feign.response.reluserrole.ApiSelectedTenantUserRoleListResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
 /**
 /**
  * 用户-角色关系信息
  * 用户-角色关系信息
  *
  *
@@ -13,7 +24,46 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RestController
 @RequestMapping("/relUserRole")
 @RequestMapping("/relUserRole")
 @Validated
 @Validated
-public class RelUserRoleController {
+public class ApiRelUserRoleController implements ApiRelUserRoleFeignClient {
+
+    @Autowired
+    private ApiRelUserRoleService apiRelUserRoleService;
+
+    /**
+     * 租户管理-用户配置-权限配置-添加用户角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addTenantUserRoleList(ApiTenantUserRoleListAddRequest request) {
+        return apiRelUserRoleService.addTenantUserRoleList(request);
+    }
+
+    /**
+     * 租户管理-用户配置-权限配置-查询选中的角色列表
+     * @return
+     */
+    @Override
+    public Result<List<ApiSelectedTenantUserRoleListResponse>> selectedTenantUserRoleList(String tenantBizId, String userBizId) {
+        return apiRelUserRoleService.selectedTenantUserRoleList(tenantBizId,userBizId);
+    }
+
+    /**
+     * 项目管理-用户配置-权限配置-添加用户角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addProjectUserRoleList(ApiProjectUserRoleListAddRequest request) {
+        return apiRelUserRoleService.addProjectUserRoleList(request);
+    }
 
 
-    
+    /**
+     * 项目管理-用户配置-权限配置-查询选中的角色列表
+     * @return
+     */
+    @Override
+    public Result<List<ApiSelectedProjectUserRoleListResponse>> selectedProjectUserRoleList(String projectBizId, String userBizId) {
+        return apiRelUserRoleService.selectedProjectUserRoleList(projectBizId,userBizId);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiSysMenuController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiSysMenuService;
+import com.yd.user.feign.client.sysmenu.ApiSysMenuFeignClient;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuAddRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuEditRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuPageRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuTreeListRequest;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuDetailResponse;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuPageResponse;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuTreeListResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 /**
 /**
- * <p>
- * 菜单权限表 前端控制器
- * </p>
+ * 菜单信息
  *
  *
  * @author zxm
  * @author zxm
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
 @RequestMapping("/sysMenu")
 @RequestMapping("/sysMenu")
-public class SysMenuController {
+@Validated
+public class ApiSysMenuController implements ApiSysMenuFeignClient {
+
+    @Autowired
+    private ApiSysMenuService apiSysMenuService;
+
+    /**
+     * 树形菜单列表查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiSysMenuTreeListResponse>> treeList(ApiSysMenuTreeListRequest request) {
+        return apiSysMenuService.treeList(request);
+    }
+
+    /**
+     * 菜单分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiSysMenuPageResponse>> page(ApiSysMenuPageRequest request) {
+        return apiSysMenuService.page(request);
+    }
+
+    /**
+     * 获取菜单详情
+     * @param menuBizId 菜单唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result<ApiSysMenuDetailResponse> detail(String menuBizId) {
+        return apiSysMenuService.detail(menuBizId);
+    }
+
+    /**
+     * 添加菜单
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiSysMenuAddRequest request) {
+        return apiSysMenuService.add(request);
+    }
+
+    /**
+     * 编辑菜单
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiSysMenuEditRequest request) {
+        return apiSysMenuService.edit(request);
+    }
+
+    /**
+     * 删除菜单（逻辑删除） TODO
+     * @param menuBizId 菜单唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result del(String menuBizId) {
+        return apiSysMenuService.del(menuBizId);
+    }
 
 
+    /**
+     * 编辑菜单状态 TODO
+     * @param menuBizId 菜单唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String menuBizId,Integer status) {
+        return apiSysMenuService.editStatus(menuBizId,status);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiSysProjectController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiSysProjectService;
 import com.yd.user.feign.client.sysproject.ApiSysProjectFeignClient;
 import com.yd.user.feign.client.sysproject.ApiSysProjectFeignClient;
 import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
 import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
 import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
 import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
 import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
 import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
 import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
 import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
+import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -16,27 +21,31 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-07-31
  * @since 2025-07-31
  */
  */
 @RestController
 @RestController
-@RequestMapping("/ydSysProject")
+@RequestMapping("/sysProject")
+@Validated
 public class ApiSysProjectController implements ApiSysProjectFeignClient {
 public class ApiSysProjectController implements ApiSysProjectFeignClient {
 
 
+    @Autowired
+    private ApiSysProjectService apiSysProjectService;
+
     /**
     /**
      * 项目分页查询
      * 项目分页查询
      * @param request
      * @param request
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result page(ApiSysProjectPageRequest request) {
-        return null;
+    public Result<IPage<ApiSysProjectPageResponse>> page(ApiSysProjectPageRequest request) {
+        return apiSysProjectService.page(request);
     }
     }
 
 
     /**
     /**
      * 获取项目详情
      * 获取项目详情
-     * @param projectUid 项目唯一标识(业务ID)
+     * @param projectBizId 项目唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<ApiSysProjectDetailResponse> detail(String projectUid) {
-        return null;
+    public Result<ApiSysProjectDetailResponse> detail(String projectBizId) {
+        return apiSysProjectService.detail(projectBizId);
     }
     }
 
 
     /**
     /**
@@ -46,7 +55,7 @@ public class ApiSysProjectController implements ApiSysProjectFeignClient {
      */
      */
     @Override
     @Override
     public Result add(ApiSysProjectAddRequest request) {
     public Result add(ApiSysProjectAddRequest request) {
-        return null;
+        return apiSysProjectService.add(request);
     }
     }
 
 
     /**
     /**
@@ -56,27 +65,27 @@ public class ApiSysProjectController implements ApiSysProjectFeignClient {
      */
      */
     @Override
     @Override
     public Result edit(ApiSysProjectEditRequest request) {
     public Result edit(ApiSysProjectEditRequest request) {
-        return null;
+        return apiSysProjectService.edit(request);
     }
     }
 
 
     /**
     /**
-     * 删除项目（逻辑删除）
-     * @param projectUid 项目唯一标识(业务ID)
+     * 删除项目（逻辑删除） TODO
+     * @param projectBizId 项目唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result del(String projectUid) {
+    public Result del(String projectBizId) {
         return null;
         return null;
     }
     }
 
 
     /**
     /**
      * 编辑项目状态
      * 编辑项目状态
-     * @param projectUid 项目唯一标识(业务ID)
+     * @param projectBizId 项目唯一标识(业务ID)
      * @param status 状态(0:禁用 1:启用)
      * @param status 状态(0:禁用 1:启用)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result editStatus(String projectUid, Integer status) {
-        return null;
+    public Result editStatus(String projectBizId, Integer status) {
+        return apiSysProjectService.editStatus(projectBizId,status);
     }
     }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiSysRoleController.java

 package com.yd.user.api.controller;
 package com.yd.user.api.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiSysRoleService;
 import com.yd.user.feign.client.sysrole.ApiSysRoleFeignClient;
 import com.yd.user.feign.client.sysrole.ApiSysRoleFeignClient;
 import com.yd.user.feign.request.sysrole.ApiSysRoleAddRequest;
 import com.yd.user.feign.request.sysrole.ApiSysRoleAddRequest;
 import com.yd.user.feign.request.sysrole.ApiSysRoleEditRequest;
 import com.yd.user.feign.request.sysrole.ApiSysRoleEditRequest;
 import com.yd.user.feign.request.sysrole.ApiSysRolePageRequest;
 import com.yd.user.feign.request.sysrole.ApiSysRolePageRequest;
 import com.yd.user.feign.response.sysrole.ApiSysRoleDetailResponse;
 import com.yd.user.feign.response.sysrole.ApiSysRoleDetailResponse;
+import com.yd.user.feign.response.sysrole.ApiSysRolePageResponse;
+import com.yd.user.service.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -17,26 +23,30 @@ import org.springframework.web.bind.annotation.RestController;
  */
  */
 @RestController
 @RestController
 @RequestMapping("/sysRole")
 @RequestMapping("/sysRole")
+@Validated
 public class ApiSysRoleController implements ApiSysRoleFeignClient {
 public class ApiSysRoleController implements ApiSysRoleFeignClient {
 
 
+    @Autowired
+    private ApiSysRoleService apiSysRoleService;
+
     /**
     /**
      * 角色分页查询
      * 角色分页查询
      * @param request
      * @param request
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result page(ApiSysRolePageRequest request) {
-        return null;
+    public Result<IPage<ApiSysRolePageResponse>> page(ApiSysRolePageRequest request) {
+        return apiSysRoleService.page(request);
     }
     }
 
 
     /**
     /**
      * 获取角色详情
      * 获取角色详情
-     * @param roleUid 角色唯一标识(业务ID)
+     * @param roleBizId 角色唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<ApiSysRoleDetailResponse> detail(String roleUid) {
-        return null;
+    public Result<ApiSysRoleDetailResponse> detail(String roleBizId) {
+        return apiSysRoleService.detail(roleBizId);
     }
     }
 
 
     /**
     /**
@@ -46,7 +56,7 @@ public class ApiSysRoleController implements ApiSysRoleFeignClient {
      */
      */
     @Override
     @Override
     public Result add(ApiSysRoleAddRequest request) {
     public Result add(ApiSysRoleAddRequest request) {
-        return null;
+        return apiSysRoleService.add(request);
     }
     }
 
 
     /**
     /**
@@ -56,27 +66,28 @@ public class ApiSysRoleController implements ApiSysRoleFeignClient {
      */
      */
     @Override
     @Override
     public Result edit(ApiSysRoleEditRequest request) {
     public Result edit(ApiSysRoleEditRequest request) {
-        return null;
+        return apiSysRoleService.edit(request);
     }
     }
 
 
     /**
     /**
-     * 删除角色（逻辑删除）
-     * @param roleUid 角色唯一标识(业务ID)
+     * 删除角色（逻辑删除） TODO
+     * @param roleBizId 角色唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result del(String roleUid) {
+    public Result del(String roleBizId) {
         return null;
         return null;
     }
     }
 
 
     /**
     /**
      * 编辑角色状态
      * 编辑角色状态
-     * @param roleUid 角色唯一标识(业务ID)
+     * @param roleBizId 角色唯一标识(业务ID)
      * @param status 状态(0:禁用 1:启用)
      * @param status 状态(0:禁用 1:启用)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result editStatus(String roleUid, Integer status) {
-        return null;
+    public Result editStatus(String roleBizId, Integer status) {
+
+        return apiSysRoleService.editStatus(roleBizId,status);
     }
     }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiSysTenantController.java

@@ -40,12 +40,12 @@ public class ApiSysTenantController implements ApiSysTenantFeignClient {
 
 
     /**
     /**
      * 获取租户详情
      * 获取租户详情
-     * @param tenantUid 租户唯一标识(业务ID)
+     * @param tenantBizId 租户唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<ApiSysTenantDetailResponse> detail(String tenantUid) {
-        return apiSysTenantService.detail(tenantUid);
+    public Result<ApiSysTenantDetailResponse> detail(String tenantBizId) {
+        return apiSysTenantService.detail(tenantBizId);
     }
     }
 
 
     /**
     /**
@@ -69,23 +69,23 @@ public class ApiSysTenantController implements ApiSysTenantFeignClient {
     }
     }
 
 
     /**
     /**
-     * 删除租户（逻辑删除）
-     * @param tenantUid 租户唯一标识(业务ID)
+     * 删除租户（逻辑删除）TODO
+     * @param tenantBizId 租户唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result del(String tenantUid) {
+    public Result del(String tenantBizId) {
         return null;
         return null;
     }
     }
 
 
     /**
     /**
      * 编辑租户状态
      * 编辑租户状态
-     * @param tenantUid 租户唯一标识(业务ID)
+     * @param tenantBizId 租户唯一标识(业务ID)
      * @param status 状态(0:禁用 1:启用)
      * @param status 状态(0:禁用 1:启用)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result editStatus(String tenantUid, Integer status) {
-        return null;
+    public Result editStatus(String tenantBizId, Integer status) {
+        return apiSysTenantService.editStatus(tenantBizId,status);
     }
     }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/controller/ApiSysUserController.java

@@ -5,14 +5,19 @@ import com.yd.common.result.Result;
 import com.yd.user.api.service.ApiSysUserService;
 import com.yd.user.api.service.ApiSysUserService;
 import com.yd.user.feign.client.sysuser.ApiSysUserFeignClient;
 import com.yd.user.feign.client.sysuser.ApiSysUserFeignClient;
 import com.yd.user.feign.request.sysuser.ApiSysUserAddRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserAddRequest;
+import com.yd.user.feign.request.sysuser.ApiSysUserEditPwdRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserEditRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserEditRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserPageRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserPageRequest;
 import com.yd.user.feign.response.sysuser.ApiSysUserDetailResponse;
 import com.yd.user.feign.response.sysuser.ApiSysUserDetailResponse;
 import com.yd.user.feign.response.sysuser.ApiSysUserPageResponse;
 import com.yd.user.feign.response.sysuser.ApiSysUserPageResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
 /**
  * 用户信息
  * 用户信息
  *
  *
@@ -21,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
  */
 @RestController
 @RestController
 @RequestMapping("/sysUser")
 @RequestMapping("/sysUser")
+@Validated
 public class ApiSysUserController implements ApiSysUserFeignClient {
 public class ApiSysUserController implements ApiSysUserFeignClient {
 
 
     @Autowired
     @Autowired
@@ -58,10 +64,30 @@ public class ApiSysUserController implements ApiSysUserFeignClient {
 
 
     /**
     /**
      * 获取用户详情
      * 获取用户详情
-     * @param userUid 用户业务唯一标识id
+     * @param userBizId 用户业务唯一标识id
      * @return
      * @return
      */
      */
-    public Result<ApiSysUserDetailResponse> detail(String userUid) {
-        return apiSysUserService.detail(userUid);
+    public Result<ApiSysUserDetailResponse> detail(String userBizId) {
+        return apiSysUserService.detail(userBizId);
+    }
+
+    /**
+     * 编辑用户状态
+     * @param userBizId
+     * @param status
+     * @return
+     */
+    @Override
+    public Result editStatus(String userBizId,Integer status) {
+        return apiSysUserService.editStatus(userBizId,status);
+    }
+
+    /**
+     * 编辑用户密码 TODO
+     * @return
+     */
+    @Override
+    public Result editPwd(ApiSysUserEditPwdRequest request) {
+        return null;
     }
     }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/dto/ApiSysMenuAddAndEditReqCheckDto.java

@@ -2,10 +2,55 @@ package com.yd.user.api.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
+
 /**
 /**
  * 菜单添加和编辑校验入参的DTO
  * 菜单添加和编辑校验入参的DTO
  */
  */
 @Data
 @Data
-public class ApiSysMenuAddAndEditReqCheckRequest {
-    
+public class ApiSysMenuAddAndEditReqCheckDto {
+
+    /**
+     * 菜单id
+     */
+    private String menuBizId;
+
+    /**
+     * 父菜单ID
+     */
+    private String parentBizId;
+
+    /**
+     * 类型(1:目录 2:菜单 3:按钮)
+     */
+    private Integer menuType;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 作用域(1:系统级（全局） 2:租户级 3:项目级)
+     */
+    private Integer scope;
+
+    /**
+     * 所属租户ID（业务id）
+     */
+    private String tenantBizId;
+
+    /**
+     * 所属项目ID（业务id）
+     */
+    private String projectBizId;
+
+    /**
+     * 是否是超级管理员
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 操作来源 1-添加 2-编辑
+     */
+    private String oprSource;
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelProjectMenuService.java

-package com.yd.user.api.service;public interface ApiRelProjectMenuService {
+package com.yd.user.api.service;
+
+import com.yd.common.result.Result;
+
+public interface ApiRelProjectMenuService {
+
+    Result addSingleRel(String projectBizId, String menuBizId);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelProjectRoleService.java

 package com.yd.user.api.service;
 package com.yd.user.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListAddRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListPageRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleSelectPageRequest;
+import com.yd.user.feign.response.relprojectrole.ApiRelProjectRoleListPageResponse;
+import com.yd.user.feign.response.relprojectrole.ApiRelProjectRoleSelectPageResponse;
 
 
-public interface ApiRelProjectRole {
+public interface ApiRelProjectRoleService {
+
+    Result<IPage<ApiRelProjectRoleListPageResponse>> page(ApiRelProjectRoleListPageRequest request);
+
+    Result addRoleList(ApiRelProjectRoleListAddRequest request);
+
+    Result del(Long id);
+
+    Result<IPage<ApiRelProjectRoleSelectPageResponse>> selectRolePage(ApiRelProjectRoleSelectPageRequest request);
 
 
     Result addSingleRel(String projectBizId, String roleBizId);
     Result addSingleRel(String projectBizId, String roleBizId);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelProjectUserService.java

-package com.yd.user.api.service;public interface ApiRelProjectUserService {
+package com.yd.user.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListAddRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListPageRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserSelectPageRequest;
+import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserListPageResponse;
+import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserSelectPageResponse;
+
+public interface ApiRelProjectUserService {
+
+    Result<IPage<ApiRelProjectUserListPageResponse>> page(ApiRelProjectUserListPageRequest request);
+
+    Result addUserList(ApiRelProjectUserListAddRequest request);
+
+    Result del(Long id);
+
+    Result<IPage<ApiRelProjectUserSelectPageResponse>> selectUserPage(ApiRelProjectUserSelectPageRequest request);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelTenantMenuService.java

-package com.yd.user.api.service;public interface ApiRelTenantMenuService {
+package com.yd.user.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListAddRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListPageRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuSelectPageRequest;
+import com.yd.user.feign.response.reltenantmenu.ApiRelTenantMenuListPageResponse;
+import com.yd.user.feign.response.reltenantmenu.ApiRelTenantMenuSelectPageResponse;
+
+public interface ApiRelTenantMenuService {
+
+    Result<IPage<ApiRelTenantMenuListPageResponse>> page(ApiRelTenantMenuListPageRequest request);
+
+    Result addMenuList(ApiRelTenantMenuListAddRequest request);
+
+    Result del(Long id);
+
+    Result<IPage<ApiRelTenantMenuSelectPageResponse>> selectMenuPage(ApiRelTenantMenuSelectPageRequest request);
+
+    Result addSingleRel(String tenantBizId, String menuBizId);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelTenantProjectService.java

-package com.yd.user.api.service;public interface ApiRelTenantProjectService {
+package com.yd.user.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
+
+import java.util.List;
+
+public interface ApiRelTenantProjectService {
+
+    Result<IPage<ApiRelTenantProjectListPageResponse>> page(ApiRelTenantProjectListPageRequest request);
+
+    Result addProjectList(ApiRelTenantProjectListAddRequest request);
+
+    Result del(Long id);
+
+    Result<IPage<ApiRelTenantProjectSelectPageResponse>> selectProjectPage(ApiRelTenantProjectSelectPageRequest request);
+
+    Result addSingleRel(String tenantBizId,String projectBizId);
+
+    Result delRelByProjectBizId(String projectBizId);
+
+    Result delRelByProjectBizIdNeTenantBizIdList(String projectBizId, List<String> tenantBizIdList);
+
+    Result delRelByTenantBizId(String tenantBizId);
+
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelTenantRoleService.java

 package com.yd.user.api.service;
 package com.yd.user.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListAddRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListPageRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleSelectPageRequest;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleListPageResponse;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleSelectPageResponse;
 
 
-public interface RelTenantRoleService {
+public interface ApiRelTenantRoleService {
+
+    Result<IPage<ApiRelTenantRoleListPageResponse>> page(ApiRelTenantRoleListPageRequest request);
+
+    Result addRoleList(ApiRelTenantRoleListAddRequest request);
+
+    Result del(Long id);
+
+    Result<IPage<ApiRelTenantRoleSelectPageResponse>> selectRolePage(ApiRelTenantRoleSelectPageRequest request);
 
 
     Result addSingleRel(String tenantBizId, String roleBizId);
     Result addSingleRel(String tenantBizId, String roleBizId);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelTenantUserService.java

-package com.yd.user.api.service;public interface ApiRelTenantUserService {
+package com.yd.user.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListAddRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListPageRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserSelectPageRequest;
+import com.yd.user.feign.response.reltenantuser.ApiRelTenantUserListPageResponse;
+import com.yd.user.feign.response.reltenantuser.ApiRelTenantUserSelectPageResponse;
+
+public interface ApiRelTenantUserService {
+
+    Result<IPage<ApiRelTenantUserListPageResponse>> page(ApiRelTenantUserListPageRequest request);
+
+    Result addUserList(ApiRelTenantUserListAddRequest request);
+
+    Result del(Long id);
+
+    Result<IPage<ApiRelTenantUserSelectPageResponse>> selectUserPage(ApiRelTenantUserSelectPageRequest request);
+
+    Result addSingleRel(String tenantBizId, String userBizId);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiRelUserRoleService.java

-package com.yd.user.api.service;public interface ApiRelUserRoleService {
+package com.yd.user.api.service;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.reluserrole.ApiProjectUserRoleListAddRequest;
+import com.yd.user.feign.request.reluserrole.ApiTenantUserRoleListAddRequest;
+import com.yd.user.feign.response.reluserrole.ApiSelectedProjectUserRoleListResponse;
+import com.yd.user.feign.response.reluserrole.ApiSelectedTenantUserRoleListResponse;
+
+import java.util.List;
+
+public interface ApiRelUserRoleService {
+
+    Result addTenantUserRoleList(ApiTenantUserRoleListAddRequest request);
+
+    Result<List<ApiSelectedTenantUserRoleListResponse>> selectedTenantUserRoleList(String tenantBizId, String userBizId);
+
+    Result addProjectUserRoleList(ApiProjectUserRoleListAddRequest request);
+
+    Result<List<ApiSelectedProjectUserRoleListResponse>> selectedProjectUserRoleList(String projectBizId, String userBizId);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiSysMenuService.java

-package com.yd.user.api.service;public interface ApiSysMenuService {
+package com.yd.user.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuAddRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuEditRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuPageRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuTreeListRequest;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuDetailResponse;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuPageResponse;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuTreeListResponse;
+
+import java.util.List;
+
+public interface ApiSysMenuService {
+
+    Result<List<ApiSysMenuTreeListResponse>> treeList(ApiSysMenuTreeListRequest request);
+
+    Result<IPage<ApiSysMenuPageResponse>> page(ApiSysMenuPageRequest request);
+
+    Result<ApiSysMenuDetailResponse> detail(String menuBizId);
+
+    Result add(ApiSysMenuAddRequest request);
+
+    Result edit(ApiSysMenuEditRequest request);
+
+    Result del(String menuBizId);
+
+    Result editStatus(String menuBizId, Integer status);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiSysProjectService.java

-package com.yd.user.api.service;public interface ApiSysProjectService {
+package com.yd.user.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
+import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
+import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
+import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
+import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse;
+
+public interface ApiSysProjectService {
+
+    Result<IPage<ApiSysProjectPageResponse>> page(ApiSysProjectPageRequest request);
+
+    Result<ApiSysProjectDetailResponse> detail(String projectBizId);
+
+    Result add(ApiSysProjectAddRequest request);
+
+    Result edit(ApiSysProjectEditRequest request);
+
+    Result editStatus(String projectBizId, Integer status);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiSysRoleService.java

-package com.yd.user.api.service;public interface ApiSysRoleService {
+package com.yd.user.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.user.feign.request.sysrole.ApiSysRoleAddRequest;
+import com.yd.user.feign.request.sysrole.ApiSysRoleEditRequest;
+import com.yd.user.feign.request.sysrole.ApiSysRolePageRequest;
+import com.yd.user.feign.response.sysrole.ApiSysRoleDetailResponse;
+import com.yd.user.feign.response.sysrole.ApiSysRolePageResponse;
+
+public interface ApiSysRoleService {
+
+    Result<IPage<ApiSysRolePageResponse>> page(ApiSysRolePageRequest request);
+
+    Result<ApiSysRoleDetailResponse> detail(String roleBizId);
+
+    Result add(ApiSysRoleAddRequest request);
+
+    Result edit(ApiSysRoleEditRequest request);
+
+    Result editStatus(String roleBizId, Integer status);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiSysTenantService.java

@@ -12,9 +12,11 @@ public interface ApiSysTenantService {
 
 
     Result<IPage<ApiSysTenantPageResponse>> page(ApiSysTenantPageRequest request);
     Result<IPage<ApiSysTenantPageResponse>> page(ApiSysTenantPageRequest request);
 
 
-    Result<ApiSysTenantDetailResponse> detail(String tenantUid);
+    Result<ApiSysTenantDetailResponse> detail(String tenantBizId);
 
 
     Result add(ApiSysTenantAddRequest request);
     Result add(ApiSysTenantAddRequest request);
 
 
     Result edit(ApiSysTenantEditRequest request);
     Result edit(ApiSysTenantEditRequest request);
+
+    Result editStatus(String tenantBizId, Integer status);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiSysUserService.java

@@ -16,5 +16,7 @@ public interface ApiSysUserService {
 
 
     Result edit(ApiSysUserEditRequest request);
     Result edit(ApiSysUserEditRequest request);
 
 
-    Result<ApiSysUserDetailResponse> detail(String userUid);
+    Result<ApiSysUserDetailResponse> detail(String userBizId);
+
+    Result editStatus(String userBizId,Integer status);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelProjectMenuServiceImpl.java

-package com.yd.user.api.service.impl;public class ApiRelProjectMenuServiceImpl {
+package com.yd.user.api.service.impl;
+
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelProjectMenuService;
+import com.yd.user.service.model.RelProjectMenu;
+import com.yd.user.service.service.IRelProjectMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ApiRelProjectMenuServiceImpl implements ApiRelProjectMenuService {
+
+    @Autowired
+    private IRelProjectMenuService iRelProjectMenuService;
+
+    /**
+     * 添加单个项目和菜单关系
+     * @param projectBizId
+     * @param menuBizId
+     * @return
+     */
+    @Override
+    public Result addSingleRel(String projectBizId, String menuBizId) {
+        //新增关系
+        RelProjectMenu relProjectMenu = new RelProjectMenu();
+        relProjectMenu.setProjectBizId(projectBizId);
+        relProjectMenu.setMenuBizId(menuBizId);
+        iRelProjectMenuService.saveOrUpdate(relProjectMenu);
+        return Result.success();
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelProjectRoleServiceImpl.java

 package com.yd.user.api.service.impl;
 package com.yd.user.api.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.user.api.service.ApiRelProjectRoleService;
 import com.yd.user.api.service.ApiRelProjectRoleService;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListAddRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListPageRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleSelectPageRequest;
+import com.yd.user.feign.response.relprojectrole.ApiRelProjectRoleListPageResponse;
+import com.yd.user.feign.response.relprojectrole.ApiRelProjectRoleSelectPageResponse;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleListPageResponse;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleSelectPageResponse;
 import com.yd.user.service.model.RelProjectRole;
 import com.yd.user.service.model.RelProjectRole;
+import com.yd.user.service.model.RelTenantRole;
 import com.yd.user.service.service.IRelProjectRoleService;
 import com.yd.user.service.service.IRelProjectRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
-public class ApiRelProjectRoleImpl implements ApiRelProjectRoleService {
+public class ApiRelProjectRoleServiceImpl implements ApiRelProjectRoleService {
 
 
     @Autowired
     @Autowired
     private IRelProjectRoleService iRelProjectRoleService;
     private IRelProjectRoleService iRelProjectRoleService;
 
 
     /**
     /**
+     * 项目和角色关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectRoleListPageResponse>> page(ApiRelProjectRoleListPageRequest request) {
+        Page<ApiRelProjectRoleListPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelProjectRoleListPageResponse> iPage = iRelProjectRoleService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加项目和角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addRoleList(ApiRelProjectRoleListAddRequest request) {
+        List<RelProjectRole> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getRoleBizIdList())) {
+            //角色唯一标识(业务ID) 列表（选中列表）不为空
+            list = request.getRoleBizIdList().stream().map(bizId -> {
+                RelProjectRole relProjectRole = new RelProjectRole();
+                relProjectRole.setProjectBizId(request.getProjectBizId());
+                relProjectRole.setRoleBizId(bizId);
+                return relProjectRole;
+            }).collect(Collectors.toList());
+
+            iRelProjectRoleService.saveOrUpdateBatch(list);
+        }
+
+        return Result.success();
+    }
+
+    /**
+     * 删除项目和角色关系
+     * @param id 项目和角色关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        RelProjectRole relProjectRole = iRelProjectRoleService.queryOne(id);
+        if (Objects.isNull(relProjectRole)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        iRelProjectRoleService.removeById(relProjectRole.getId());
+        return Result.success();
+    }
+
+    /**
+     * 导入-选择角色分页查询（查询当前项目级（当前所属项目绑定的角色）或者系统级（全局角色在任何地方都适用导入绑定）的角色表数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectRoleSelectPageResponse>> selectRolePage(ApiRelProjectRoleSelectPageRequest request) {
+        Page<ApiRelProjectRoleSelectPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelProjectRoleSelectPageResponse> iPage = iRelProjectRoleService.selectProjectPage(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
      * 添加单个关系
      * 添加单个关系
      * @param projectBizId
      * @param projectBizId
      * @param roleBizId
      * @param roleBizId

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelProjectUserServiceImpl.java

-package com.yd.user.api.service.impl;public class ApiRelProjectUserServiceImpl {
+package com.yd.user.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelProjectUserService;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListAddRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListPageRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserSelectPageRequest;
+import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserListPageResponse;
+import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserSelectPageResponse;
+import com.yd.user.service.model.RelProjectUser;
+import com.yd.user.service.service.IRelProjectUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiRelProjectUserServiceImpl implements ApiRelProjectUserService {
+
+    @Autowired
+    private IRelProjectUserService iRelProjectUserService;
+
+    /**
+     * 项目和用户关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectUserListPageResponse>> page(ApiRelProjectUserListPageRequest request) {
+        Page<ApiRelProjectUserListPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelProjectUserListPageResponse> iPage = iRelProjectUserService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加项目和用户列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addUserList(ApiRelProjectUserListAddRequest request) {
+        List<RelProjectUser> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getUserBizIdList())) {
+            //用户唯一标识(业务ID) 列表（选中列表）不为空
+            list = request.getUserBizIdList().stream().map(bizId -> {
+                RelProjectUser relTenantUser = new RelProjectUser();
+                relTenantUser.setProjectBizId(request.getProjectBizId());
+                relTenantUser.setUserBizId(bizId);
+                return relTenantUser;
+            }).collect(Collectors.toList());
+
+            iRelProjectUserService.saveOrUpdateBatch(list);
+        }
+
+        return Result.success();
+    }
+
+    /**
+     * 删除项目和用户关系
+     * @param id 项目和用户关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        RelProjectUser relProjectUser = iRelProjectUserService.queryOne(id);
+        if (Objects.isNull(relProjectUser)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        iRelProjectUserService.removeById(relProjectUser.getId());
+        return Result.success();
+    }
+
+    /**
+     * 导入-选择用户分页查询（查询用户库的用户id不在当前项目用户关系的用户id列表中的数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelProjectUserSelectPageResponse>> selectUserPage(ApiRelProjectUserSelectPageRequest request) {
+        Page<ApiRelProjectUserSelectPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelProjectUserSelectPageResponse> iPage = iRelProjectUserService.selectUserPage(page, request);
+        return Result.success(iPage);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelTenantMenuServiceImpl.java

-package com.yd.user.api.service.impl;public class ApiRelTenantMenuServiceImpl {
+package com.yd.user.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelTenantMenuService;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListAddRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListPageRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuSelectPageRequest;
+import com.yd.user.feign.response.reltenantmenu.ApiRelTenantMenuListPageResponse;
+import com.yd.user.feign.response.reltenantmenu.ApiRelTenantMenuSelectPageResponse;
+import com.yd.user.service.model.RelTenantMenu;
+import com.yd.user.service.service.IRelTenantMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiRelTenantMenuServiceImpl implements ApiRelTenantMenuService {
+
+    @Autowired
+    private IRelTenantMenuService iRelTenantMenuService;
+
+    /**
+     * 租户和菜单关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantMenuListPageResponse>> page(ApiRelTenantMenuListPageRequest request) {
+        Page<ApiRelTenantMenuListPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantMenuListPageResponse> iPage = iRelTenantMenuService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加租户和菜单列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addMenuList(ApiRelTenantMenuListAddRequest request) {
+        List<RelTenantMenu> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getMenuBizIdList())) {
+            //菜单唯一标识(业务ID) 列表（选中列表）不为空
+            list = request.getMenuBizIdList().stream().map(bizId -> {
+                RelTenantMenu relTenantMenu = new RelTenantMenu();
+                relTenantMenu.setTenantBizId(request.getTenantBizId());
+                relTenantMenu.setMenuBizId(bizId);
+                return relTenantMenu;
+            }).collect(Collectors.toList());
+
+            iRelTenantMenuService.saveOrUpdateBatch(list);
+        }
+
+        return Result.success();
+    }
+
+    /**
+     * 删除租户和菜单关系
+     * @param id 租户和菜单关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        RelTenantMenu relTenantMenu = iRelTenantMenuService.queryOne(id);
+        if (Objects.isNull(relTenantMenu)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        iRelTenantMenuService.removeById(relTenantMenu.getId());
+        return Result.success();
+    }
+
+    /**
+     * 导入-选择菜单分页查询（查询当前租户级（当前所属租户绑定的菜单）或者系统级（全局菜单在任何地方都适用导入绑定）的菜单表数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantMenuSelectPageResponse>> selectMenuPage(ApiRelTenantMenuSelectPageRequest request) {
+        Page<ApiRelTenantMenuSelectPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantMenuSelectPageResponse> iPage = iRelTenantMenuService.selectProjectPage(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加单个租户和菜单关系
+     * @param tenantBizId
+     * @param menuBizId
+     * @return
+     */
+    @Override
+    public Result addSingleRel(String tenantBizId, String menuBizId) {
+        //新增关系
+        RelTenantMenu relTenantMenu = new RelTenantMenu();
+        relTenantMenu.setTenantBizId(tenantBizId);
+        relTenantMenu.setMenuBizId(menuBizId);
+        iRelTenantMenuService.saveOrUpdate(relTenantMenu);
+        return Result.success();
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelTenantProjectServiceImpl.java

-package com.yd.user.api.service.impl;public class ApiRelTenantProjectServiceImpl {
+package com.yd.user.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelTenantProjectService;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
+import com.yd.user.service.model.RelTenantProject;
+import com.yd.user.service.service.IRelTenantProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiRelTenantProjectServiceImpl implements ApiRelTenantProjectService {
+
+    @Autowired
+    private IRelTenantProjectService iRelTenantProjectService;
+
+    /**
+     * 租户和项目关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantProjectListPageResponse>> page(ApiRelTenantProjectListPageRequest request) {
+        Page<ApiRelTenantProjectListPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantProjectListPageResponse> iPage = iRelTenantProjectService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加租户和项目列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addProjectList(ApiRelTenantProjectListAddRequest request) {
+        List<RelTenantProject> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getProjectBizIdList())) {
+            //项目唯一标识(业务ID) 列表（选中列表）不为空
+            list = request.getProjectBizIdList().stream().map(bizId -> {
+                RelTenantProject relTenantProject = new RelTenantProject();
+                relTenantProject.setTenantBizId(request.getTenantBizId());
+                relTenantProject.setProjectBizId(bizId);
+                return relTenantProject;
+            }).collect(Collectors.toList());
+
+            iRelTenantProjectService.saveOrUpdateBatch(list);
+        }
+
+        return Result.success();
+    }
+
+    /**
+     * 删除租户和项目关系
+     * @param id 租户和项目关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        RelTenantProject relTenantProject = iRelTenantProjectService.queryOne(id);
+        if (Objects.isNull(relTenantProject)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        iRelTenantProjectService.removeById(relTenantProject.getId());
+        return Result.success();
+    }
+
+    /**
+     * 导入-选择项目分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantProjectSelectPageResponse>> selectProjectPage(ApiRelTenantProjectSelectPageRequest request) {
+        Page<ApiRelTenantProjectSelectPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantProjectSelectPageResponse> iPage = iRelTenantProjectService.selectProjectPage(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加单个租户和项目关系
+     * @param tenantBizId
+     * @param projectBizId
+     * @return
+     */
+    @Override
+    public Result addSingleRel(String tenantBizId, String projectBizId) {
+        //新增关系
+        RelTenantProject relTenantProject1 = new RelTenantProject();
+        relTenantProject1.setTenantBizId(tenantBizId);
+        relTenantProject1.setProjectBizId(projectBizId);
+        iRelTenantProjectService.saveOrUpdate(relTenantProject1);
+        return Result.success();
+    }
+
+    /**
+     * 根据项目业务id批量删除租户和项目关系
+     * @param projectBizId
+     * @return
+     */
+    @Override
+    public Result delRelByProjectBizId(String projectBizId) {
+        iRelTenantProjectService.delRelByProjectBizId(projectBizId);
+        return Result.success();
+    }
+
+    /**
+     * 根据项目id删除关系（保留传入租户id列表的关系）
+     * @param projectBizId
+     * @return
+     */
+    @Override
+    public Result delRelByProjectBizIdNeTenantBizIdList(String projectBizId, List<String> tenantBizIdList) {
+        iRelTenantProjectService.delRelByProjectBizIdNeTenantBizIdList(projectBizId,tenantBizIdList);
+        return Result.success();
+    }
+
+    /**
+     * 根据租户业务id批量删除租户和项目关系
+     * @param tenantBizId
+     * @return
+     */
+    @Override
+    public Result delRelByTenantBizId(String tenantBizId) {
+        iRelTenantProjectService.delRelByTenantBizId(tenantBizId);
+        return Result.success();
+    }
+
+
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelTenantRoleServiceImpl.java

 package com.yd.user.api.service.impl;
 package com.yd.user.api.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.user.api.service.ApiRelTenantRoleService;
 import com.yd.user.api.service.ApiRelTenantRoleService;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListAddRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListPageRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleSelectPageRequest;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
+import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleListPageResponse;
+import com.yd.user.feign.response.reltenantrole.ApiRelTenantRoleSelectPageResponse;
+import com.yd.user.service.model.RelTenantProject;
 import com.yd.user.service.model.RelTenantRole;
 import com.yd.user.service.model.RelTenantRole;
 import com.yd.user.service.service.IRelTenantRoleService;
 import com.yd.user.service.service.IRelTenantRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
-public class RelTenantRoleServiceImpl implements ApiRelTenantRoleService {
+public class ApiRelTenantRoleServiceImpl implements ApiRelTenantRoleService {
 
 
     @Autowired
     @Autowired
     private IRelTenantRoleService iRelTenantRoleService;
     private IRelTenantRoleService iRelTenantRoleService;
 
 
     /**
     /**
+     * 租户和角色关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantRoleListPageResponse>> page(ApiRelTenantRoleListPageRequest request) {
+        Page<ApiRelTenantRoleListPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantRoleListPageResponse> iPage = iRelTenantRoleService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加租户和角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addRoleList(ApiRelTenantRoleListAddRequest request) {
+        List<RelTenantRole> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getRoleBizIdList())) {
+            //角色唯一标识(业务ID) 列表（选中列表）不为空
+            list = request.getRoleBizIdList().stream().map(bizId -> {
+                RelTenantRole relTenantRole = new RelTenantRole();
+                relTenantRole.setTenantBizId(request.getTenantBizId());
+                relTenantRole.setRoleBizId(bizId);
+                return relTenantRole;
+            }).collect(Collectors.toList());
+
+            iRelTenantRoleService.saveOrUpdateBatch(list);
+        }
+
+        return Result.success();
+    }
+
+    /**
+     * 删除租户和角色关系
+     * @param id 租户和角色关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        RelTenantRole relTenantRole = iRelTenantRoleService.queryOne(id);
+        if (Objects.isNull(relTenantRole)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        iRelTenantRoleService.removeById(relTenantRole.getId());
+        return Result.success();
+    }
+
+    /**
+     * 导入-选择角色分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantRoleSelectPageResponse>> selectRolePage(ApiRelTenantRoleSelectPageRequest request) {
+        Page<ApiRelTenantRoleSelectPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantRoleSelectPageResponse> iPage = iRelTenantRoleService.selectProjectPage(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
      * 添加-单个租户和项目关系
      * 添加-单个租户和项目关系
      * @param tenantBizId
      * @param tenantBizId
      * @param roleBizId
      * @param roleBizId

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelTenantUserServiceImpl.java

-package com.yd.user.api.service.impl;public class ApiRelTenantUserServiceImpl {
+package com.yd.user.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelTenantUserService;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListAddRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListPageRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserSelectPageRequest;
+import com.yd.user.feign.response.reltenantuser.ApiRelTenantUserListPageResponse;
+import com.yd.user.feign.response.reltenantuser.ApiRelTenantUserSelectPageResponse;
+import com.yd.user.service.model.RelTenantUser;
+import com.yd.user.service.service.IRelTenantUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiRelTenantUserServiceImpl implements ApiRelTenantUserService {
+
+    @Autowired
+    private IRelTenantUserService iRelTenantUserService;
+
+    /**
+     * 租户和用户关系分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantUserListPageResponse>> page(ApiRelTenantUserListPageRequest request) {
+        Page<ApiRelTenantUserListPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantUserListPageResponse> iPage = iRelTenantUserService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加租户和用户列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addUserList(ApiRelTenantUserListAddRequest request) {
+        List<RelTenantUser> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getUserBizIdList())) {
+            //用户唯一标识(业务ID) 列表（选中列表）不为空
+            list = request.getUserBizIdList().stream().map(bizId -> {
+                RelTenantUser relTenantUser = new RelTenantUser();
+                relTenantUser.setTenantBizId(request.getTenantBizId());
+                relTenantUser.setUserBizId(bizId);
+                return relTenantUser;
+            }).collect(Collectors.toList());
+
+            iRelTenantUserService.saveOrUpdateBatch(list);
+        }
+
+        return Result.success();
+    }
+
+    /**
+     * 删除租户和用户关系
+     * @param id 租户和用户关系表主键id
+     * @return
+     */
+    @Override
+    public Result del(Long id) {
+        RelTenantUser relTenantUser = iRelTenantUserService.queryOne(id);
+        if (Objects.isNull(relTenantUser)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        iRelTenantUserService.removeById(relTenantUser.getId());
+        return Result.success();
+    }
+
+    /**
+     * 导入-选择用户分页查询（查询用户库的用户id不在当前租户用户关系的用户id列表中的数据）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiRelTenantUserSelectPageResponse>> selectUserPage(ApiRelTenantUserSelectPageRequest request) {
+        Page<ApiRelTenantUserSelectPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiRelTenantUserSelectPageResponse> iPage = iRelTenantUserService.selectUserPage(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 添加单个租户和用户关系
+     * @param tenantBizId
+     * @param userBizId
+     * @return
+     */
+    @Override
+    public Result addSingleRel(String tenantBizId, String userBizId) {
+        RelTenantUser relTenantUser = new RelTenantUser();
+        relTenantUser.setTenantBizId(tenantBizId);
+        relTenantUser.setUserBizId(userBizId);
+        iRelTenantUserService.saveOrUpdate(relTenantUser);
+        return Result.success();
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelUserRoleServiceImpl.java

-package com.yd.user.api.service.impl;public class ApiRelUserRoleServiceImpl {
+package com.yd.user.api.service.impl;
+
+import com.yd.common.result.Result;
+import com.yd.user.api.service.ApiRelUserRoleService;
+import com.yd.user.feign.request.reluserrole.ApiProjectUserRoleListAddRequest;
+import com.yd.user.feign.request.reluserrole.ApiTenantUserRoleListAddRequest;
+import com.yd.user.feign.response.reluserrole.ApiSelectedProjectUserRoleListResponse;
+import com.yd.user.feign.response.reluserrole.ApiSelectedTenantUserRoleListResponse;
+import com.yd.user.service.model.RelUserRole;
+import com.yd.user.service.service.IRelUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiRelUserRoleServiceImpl implements ApiRelUserRoleService {
+
+    @Autowired
+    private IRelUserRoleService iRelUserRoleService;
+
+    /**
+     * 租户管理-添加用户角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addTenantUserRoleList(ApiTenantUserRoleListAddRequest request) {
+        //先删后新增关系
+        //删除租户用户角色列表关系
+        iRelUserRoleService.delRelTenantUserRole(request.getTenantBizId(),request.getUserBizId());
+
+        //新增租户用户角色列表关系
+        if (!CollectionUtils.isEmpty(request.getRoleBizIdList())) {
+            List<RelUserRole> list = request.getRoleBizIdList().stream().map(bizId -> {
+                RelUserRole relUserRole = new RelUserRole();
+                relUserRole.setTenantBizId(request.getTenantBizId());
+                relUserRole.setUserBizId(request.getUserBizId());
+                relUserRole.setRoleBizId(bizId);
+                return relUserRole;
+            }).collect(Collectors.toList());
+
+            iRelUserRoleService.saveOrUpdateBatch(list);
+        }
+        return Result.success();
+    }
+
+    /**
+     * 租户管理-用户配置-权限配置-查询选中的角色列表
+     * @return
+     */
+    @Override
+    public Result<List<ApiSelectedTenantUserRoleListResponse>> selectedTenantUserRoleList(String tenantBizId, String userBizId) {
+        List<ApiSelectedTenantUserRoleListResponse> list = iRelUserRoleService.selectedTenantUserRoleList(tenantBizId,userBizId);
+        return Result.success(list);
+    }
+
+    /**
+     * 项目管理-用户配置-权限配置-添加用户角色列表关系
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addProjectUserRoleList(ApiProjectUserRoleListAddRequest request) {
+        //先删后新增关系
+        //删除项目用户角色列表关系
+        iRelUserRoleService.delRelProjectUserRole(request.getProjectBizId(),request.getUserBizId());
+
+        //新增租户用户角色列表关系
+        if (!CollectionUtils.isEmpty(request.getRoleBizIdList())) {
+            List<RelUserRole> list = request.getRoleBizIdList().stream().map(bizId -> {
+                RelUserRole relUserRole = new RelUserRole();
+                relUserRole.setProjectBizId(request.getProjectBizId());
+                relUserRole.setUserBizId(request.getUserBizId());
+                relUserRole.setRoleBizId(bizId);
+                return relUserRole;
+            }).collect(Collectors.toList());
+
+            iRelUserRoleService.saveOrUpdateBatch(list);
+        }
+        return Result.success();
+    }
+
+    /**
+     * 项目管理-用户配置-权限配置-查询选中的角色列表
+     * @return
+     */
+    @Override
+    public Result<List<ApiSelectedProjectUserRoleListResponse>> selectedProjectUserRoleList(String projectBizId, String userBizId) {
+        List<ApiSelectedProjectUserRoleListResponse> list = iRelUserRoleService.selectedProjectUserRoleList(projectBizId,userBizId);
+        return Result.success(list);
+    }
+
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiSysTenantServiceImpl.java

@@ -16,6 +16,7 @@ import com.yd.user.feign.response.systenant.ApiSysTenantPageResponse;
 import com.yd.user.service.dto.SysTenantDto;
 import com.yd.user.service.dto.SysTenantDto;
 import com.yd.user.service.model.SysTenant;
 import com.yd.user.service.model.SysTenant;
 import com.yd.user.service.service.ISysTenantService;
 import com.yd.user.service.service.ISysTenantService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -37,19 +38,25 @@ public class ApiSysTenantServiceImpl implements ApiSysTenantService {
      */
      */
     @Override
     @Override
     public Result<IPage<ApiSysTenantPageResponse>> page(ApiSysTenantPageRequest request) {
     public Result<IPage<ApiSysTenantPageResponse>> page(ApiSysTenantPageRequest request) {
+        //TODO 当前登录用户的角色类型 true是超级管理员 false是超级管理员
+        Boolean isAdmin = false;
+        //TODO 获取当前登录用户id
+        String userBizId = "";
+        //TODO 当前登录人所属租户id
+        String loginTenantBizId = "";
         Page<ApiSysTenantPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
         Page<ApiSysTenantPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
-        IPage<ApiSysTenantPageResponse> iPage = iSysTenantService.page(page, request);
+        IPage<ApiSysTenantPageResponse> iPage = iSysTenantService.page(page, request,isAdmin,userBizId,loginTenantBizId);
         return Result.success(iPage);
         return Result.success(iPage);
     }
     }
 
 
     /**
     /**
      * 获取租户详情
      * 获取租户详情
-     * @param tenantUid 租户唯一标识(业务ID)
+     * @param tenantBizId 租户唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<ApiSysTenantDetailResponse> detail(String tenantUid) {
-        SysTenant sysTenant = iSysTenantService.queryOne(tenantUid);
+    public Result<ApiSysTenantDetailResponse> detail(String tenantBizId) {
+        SysTenant sysTenant = iSysTenantService.queryOne(tenantBizId);
         ApiSysTenantDetailResponse response = null;
         ApiSysTenantDetailResponse response = null;
         if (!Objects.isNull(sysTenant)) {
         if (!Objects.isNull(sysTenant)) {
             response = new ApiSysTenantDetailResponse();
             response = new ApiSysTenantDetailResponse();
@@ -65,6 +72,12 @@ public class ApiSysTenantServiceImpl implements ApiSysTenantService {
      */
      */
     @Override
     @Override
     public Result add(ApiSysTenantAddRequest request) {
     public Result add(ApiSysTenantAddRequest request) {
+        //TODO 当前登录用户的角色类型 true是超级管理员 false是超级管理员
+        Boolean isAdmin = false;
+        if (!isAdmin) {
+            //非超级管理员不能添加租户
+            throw new BusinessException("非超级管理员不能添加租户！");
+        }
         List<SysTenant> list = iSysTenantService.queryList(SysTenantDto.builder()
         List<SysTenant> list = iSysTenantService.queryList(SysTenantDto.builder()
                 .tenantName(request.getTenantName())
                 .tenantName(request.getTenantName())
                 .build());
                 .build());
@@ -75,8 +88,8 @@ public class ApiSysTenantServiceImpl implements ApiSysTenantService {
         //新增
         //新增
         SysTenant sysTenant = new SysTenant();
         SysTenant sysTenant = new SysTenant();
         BeanUtils.copyProperties(request,sysTenant);
         BeanUtils.copyProperties(request,sysTenant);
-        sysTenant.setTenantUid(RandomStringGenerator.generateUid16(CommonEnum.UID_TYPE_TENANT.getCode()));
-        iSysTenantService.save(sysTenant);
+        sysTenant.setTenantBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_TENANT.getCode()));
+        iSysTenantService.saveOrUpdate(sysTenant);
         return Result.success();
         return Result.success();
     }
     }
 
 
@@ -87,7 +100,58 @@ public class ApiSysTenantServiceImpl implements ApiSysTenantService {
      */
      */
     @Override
     @Override
     public Result edit(ApiSysTenantEditRequest request) {
     public Result edit(ApiSysTenantEditRequest request) {
+        //TODO 当前登录用户的角色类型 true是超级管理员 false是超级管理员
+        Boolean isAdmin = false;
+
+        //校验租户是否存在
+        checkSysTenantIsExist(request.getTenantBizId());
 
 
+        //校验租户名称的唯一性
+        List<SysTenant> list = iSysTenantService.queryList(SysTenantDto.builder()
+                .tenantName(request.getTenantName())
+                .tenantBizId(request.getTenantBizId())
+                .isExcludeMy(true)
+                .build());
+        if (!CollectionUtils.isEmpty(list)) {
+            //租户名称已存在
+            throw new BusinessException(ResultCode.TENANT_NAME_EXISTS.getCode(),ResultCode.TENANT_NAME_EXISTS.getMessage());
+        }
+        //编辑
+        SysTenant sysTenant = new SysTenant();
+        BeanUtils.copyProperties(request,sysTenant);
+        sysTenant.setTenantBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_TENANT.getCode()));
+        iSysTenantService.saveOrUpdate(sysTenant);
         return Result.success();
         return Result.success();
     }
     }
+
+    /**
+     * 编辑租户状态
+     * @param tenantBizId 租户唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String tenantBizId, Integer status) {
+        //校验租户是否存在
+        Result<SysTenant> result = checkSysTenantIsExist(tenantBizId);
+
+        SysTenant sysTenant = result.getData();
+        sysTenant.setStatus(status);
+        iSysTenantService.saveOrUpdate(sysTenant);
+        return Result.success();
+    }
+
+    /**
+     * 校验租户是否存在
+     * @param tenantBizId
+     * @return
+     */
+    public Result<SysTenant> checkSysTenantIsExist(String tenantBizId) {
+        SysTenant sysTenant = iSysTenantService.queryOne(tenantBizId);
+        if (Objects.isNull(sysTenant)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        return Result.success(sysTenant);
+    }
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiSysUserServiceImpl.java

@@ -2,21 +2,29 @@ package com.yd.user.api.service.impl;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.ResultCode;
 import com.yd.common.enums.ResultCode;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
+import com.yd.common.utils.RandomStringGenerator;
+import com.yd.user.api.service.ApiRelTenantUserService;
 import com.yd.user.api.service.ApiSysUserService;
 import com.yd.user.api.service.ApiSysUserService;
 import com.yd.user.feign.request.sysuser.ApiSysUserAddRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserAddRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserEditRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserEditRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserPageRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserPageRequest;
 import com.yd.user.feign.response.sysuser.ApiSysUserDetailResponse;
 import com.yd.user.feign.response.sysuser.ApiSysUserDetailResponse;
 import com.yd.user.feign.response.sysuser.ApiSysUserPageResponse;
 import com.yd.user.feign.response.sysuser.ApiSysUserPageResponse;
+import com.yd.user.service.dto.SysUserDto;
+import com.yd.user.service.model.SysTenant;
 import com.yd.user.service.model.SysUser;
 import com.yd.user.service.model.SysUser;
 import com.yd.user.service.service.ISysUserService;
 import com.yd.user.service.service.ISysUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
 
 
 @Service
 @Service
@@ -25,6 +33,9 @@ public class ApiSysUserServiceImpl implements ApiSysUserService {
     @Autowired
     @Autowired
     private ISysUserService iSysUserService;
     private ISysUserService iSysUserService;
 
 
+    @Autowired
+    private ApiRelTenantUserService apiRelTenantUserService;
+
     /**
     /**
      * 用户分页查询
      * 用户分页查询
      * @param request
      * @param request
@@ -32,8 +43,12 @@ public class ApiSysUserServiceImpl implements ApiSysUserService {
      */
      */
     @Override
     @Override
     public Result<IPage<ApiSysUserPageResponse>> page(ApiSysUserPageRequest request) {
     public Result<IPage<ApiSysUserPageResponse>> page(ApiSysUserPageRequest request) {
+        //TODO 当前登录用户的角色类型 true是超级管理员 false是超级管理员
+        Boolean isAdmin = false;
+        //TODO 当前登录人所属租户id
+        String loginTenantBizId = "";
         Page<ApiSysUserPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
         Page<ApiSysUserPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
-        IPage<ApiSysUserPageResponse> iPage = iSysUserService.page(page, request);
+        IPage<ApiSysUserPageResponse> iPage = iSysUserService.page(page, request,isAdmin,loginTenantBizId);
         return Result.success(iPage);
         return Result.success(iPage);
     }
     }
 
 
@@ -44,7 +59,33 @@ public class ApiSysUserServiceImpl implements ApiSysUserService {
      */
      */
     @Override
     @Override
     public Result add(ApiSysUserAddRequest request) {
     public Result add(ApiSysUserAddRequest request) {
-        return null;
+        LocalDateTime now = LocalDateTime.now();
+        //TODO 当前登录用户的角色类型 true是超级管理员 false是超级管理员
+        Boolean isAdmin = false;
+        //TODO 当前登录人所属租户id
+        String loginTenantBizId = "";
+        //添加和编辑校验入参的唯一性
+        addAndEditReqCheckCommon(request.getUserName(),
+                request.getMobile(),
+                request.getEmail(),
+                CommonEnum.OPR_SOURCE_ADD.getCode(),"");
+
+        //新增用户数据
+        SysUser sysUser = new SysUser();
+        BeanUtils.copyProperties(request,sysUser);
+        //TODO 修改密码，加密密码
+        //用户业务唯一id
+        sysUser.setUserBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_USER.getCode()));
+        sysUser.setIsSuperAdmin(0);
+        sysUser.setLastPasswordTime(now);
+        sysUser.setSourceType(1);
+        iSysUserService.saveOrUpdate(sysUser);
+
+        if (!isAdmin) {
+            //非超级管理员，添加租户和用户的关系
+            apiRelTenantUserService.addSingleRel(loginTenantBizId,sysUser.getUserBizId());
+        }
+        return Result.success();
     }
     }
 
 
     /**
     /**
@@ -54,17 +95,78 @@ public class ApiSysUserServiceImpl implements ApiSysUserService {
      */
      */
     @Override
     @Override
     public Result edit(ApiSysUserEditRequest request) {
     public Result edit(ApiSysUserEditRequest request) {
-        return null;
+        LocalDateTime now = LocalDateTime.now();
+
+        //校验用户是否存在
+        Result<SysUser> result = checkSysUserIsExist(request.getUserBizId());
+        SysUser sysUser = result.getData();
+
+        //添加和编辑校验入参的唯一性
+        addAndEditReqCheckCommon(request.getUserName(),
+                request.getMobile(),
+                request.getEmail(),
+                CommonEnum.OPR_SOURCE_EDIT.getCode(),request.getUserBizId());
+
+        //编辑用户
+        BeanUtils.copyProperties(request,sysUser);
+        //TODO 修改密码，加密密码
+        sysUser.setLastPasswordTime(now);
+        iSysUserService.saveOrUpdate(sysUser);
+
+        return Result.success();
+    }
+
+
+    /**
+     * 添加和编辑校验入参的唯一性
+     * @param userName
+     * @param mobile
+     * @param email
+     */
+    public void addAndEditReqCheckCommon(String userName,String mobile,String email,String oprSource,String userBizId) {
+        Boolean isExcludeMy = true;
+        if (CommonEnum.OPR_SOURCE_ADD.getCode().equals(oprSource)) {
+            //添加来源
+            userBizId = "";
+            isExcludeMy = false;
+        }
+        List<SysUser> userNameList = iSysUserService.queryList(SysUserDto.builder()
+                .userName(userName)
+                .userBizId(userBizId)
+                .isExcludeMy(isExcludeMy)
+                .build());
+        if (!CollectionUtils.isEmpty(userNameList)) {
+            throw new BusinessException("用户账号已存在");
+        }
+
+        List<SysUser> mobileList = iSysUserService.queryList(SysUserDto.builder()
+                .userName(mobile)
+                .userBizId(userBizId)
+                .isExcludeMy(isExcludeMy)
+                .build());
+        if (!CollectionUtils.isEmpty(mobileList)) {
+            throw new BusinessException("手机号已存在");
+        }
+
+        List<SysUser> emailList = iSysUserService.queryList(SysUserDto.builder()
+                .userName(email)
+                .userBizId(userBizId)
+                .isExcludeMy(isExcludeMy)
+                .build());
+        if (!CollectionUtils.isEmpty(emailList)) {
+            throw new BusinessException("邮箱已存在");
+        }
+
     }
     }
 
 
     /**
     /**
      * 获取用户详情
      * 获取用户详情
-     * @param userUid
+     * @param userBizId
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<ApiSysUserDetailResponse> detail(String userUid) {
-        SysUser sysUser = iSysUserService.queryOne(userUid);
+    public Result<ApiSysUserDetailResponse> detail(String userBizId) {
+        SysUser sysUser = iSysUserService.queryOne(userBizId);
         ApiSysUserDetailResponse response = null;
         ApiSysUserDetailResponse response = null;
         if (!Objects.isNull(sysUser)) {
         if (!Objects.isNull(sysUser)) {
             response = new ApiSysUserDetailResponse();
             response = new ApiSysUserDetailResponse();
@@ -73,4 +175,35 @@ public class ApiSysUserServiceImpl implements ApiSysUserService {
 
 
         return Result.success(response);
         return Result.success(response);
     }
     }
+
+    /**
+     * 编辑用户状态
+     * @param userBizId
+     * @param status
+     * @return
+     */
+    @Override
+    public Result editStatus(String userBizId, Integer status) {
+        //校验用户是否存在
+        Result<SysUser> result = checkSysUserIsExist(userBizId);
+        SysUser sysUser = result.getData();
+
+        sysUser.setStatus(status);
+        iSysUserService.saveOrUpdate(sysUser);
+        return Result.success();
+    }
+
+    /**
+     * 校验用户是否存在
+     * @param userBizId
+     * @return
+     */
+    public Result<SysUser> checkSysUserIsExist(String userBizId) {
+        SysUser sysUser = iSysUserService.queryOne(userBizId);
+        if (Objects.isNull(sysUser)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        return Result.success(sysUser);
+    }
 }
 }

yd-user-api/target/maven-archiver/pom.properties

-#Generated by Maven
-#Mon Jul 28 15:35:05 CST 2025
-version=1.0-SNAPSHOT
-groupId=com.yd
-artifactId=yd-user-api

yd-user-feign/src/main/java/com/yd/user/feign/client/relprojectrole/ApiRelProjectRoleFeignClient.java

-package com.yd.user.feign.client.relprojectrole;public class ApiRelProjectRoleFeignClient {
+package com.yd.user.feign.client.relprojectrole;
+
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.relprojectrole.ApiRelProjectRoleFeignFallbackFactory;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListAddRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListPageRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleSelectPageRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户服务：项目-角色关系信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelProjectRoleFeignFallbackFactory.class)
+public interface ApiRelProjectRoleFeignClient {
+
+    /**
+     * 项目和角色关系分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@Validated @RequestBody ApiRelProjectRoleListPageRequest request);
+
+    /**
+     * 添加项目和角色列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/role/list")
+    Result addRoleList(@Validated @RequestBody ApiRelProjectRoleListAddRequest request);
+
+    /**
+     * 删除项目和角色关系
+     * @param id 项目和角色关系表主键id
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@NotNull(message = "项目和角色关系表主键id不能为空") @RequestParam(value = "id") Long id);
+
+    /**
+     * 导入-选择角色分页查询（查询当前项目级（当前所属项目绑定的角色）或者系统级（全局角色在任何地方都适用导入绑定）的角色表数据）
+     * @param request
+     * @return
+     */
+    @PostMapping("/select/role/page")
+    Result selectRolePage(@Validated @RequestBody ApiRelProjectRoleSelectPageRequest request);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/relprojectuser/ApiRelProjectUserFeignClient.java

-package com.yd.user.feign.client.relprojectuser;public class ApiRelProjectUserFeignClient {
+package com.yd.user.feign.client.relprojectuser;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.relprojectuser.ApiRelProjectUserFeignFallbackFactory;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListAddRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListPageRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserSelectPageRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户服务：项目-用户关系信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelProjectUserFeignFallbackFactory.class)
+public interface ApiRelProjectUserFeignClient {
+
+    /**
+     * 项目和用户关系分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@Validated @RequestBody ApiRelProjectUserListPageRequest request);
+
+    /**
+     * 添加项目和用户列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/user/list")
+    Result addUserList(@Validated @RequestBody ApiRelProjectUserListAddRequest request);
+
+    /**
+     * 删除项目和用户关系
+     * @param id 项目和用户关系表主键id
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@NotNull(message = "项目和用户关系表主键id不能为空") @RequestParam(value = "id") Long id);
+
+    /**
+     * 导入-选择用户分页查询（查询用户库的用户id不在当前项目用户关系的用户id列表中的数据）
+     * @param request
+     * @return
+     */
+    @PostMapping("/select/user/page")
+    Result selectUserPage(@Validated @RequestBody ApiRelProjectUserSelectPageRequest request);
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/reltenantmenu/ApiRelTenantMenuFeignClient.java

-package com.yd.user.feign.client.reltenantmenu;public class ApiRelTenantMenuFeignClient {
+package com.yd.user.feign.client.reltenantmenu;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.reltenantmenu.ApiRelTenantMenuFeignFallbackFactory;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListAddRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListPageRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuSelectPageRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户服务：租户-菜单关系信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelTenantMenuFeignFallbackFactory.class)
+public interface ApiRelTenantMenuFeignClient {
+
+    /**
+     * 租户和菜单关系分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@Validated @RequestBody ApiRelTenantMenuListPageRequest request);
+
+    /**
+     * 添加租户和菜单列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/menu/list")
+    Result addMenuList(@Validated @RequestBody ApiRelTenantMenuListAddRequest request);
+
+    /**
+     * 删除租户和菜单关系
+     * @param id 租户和菜单关系表主键id
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@NotNull(message = "租户和菜单关系表主键id不能为空") @RequestParam(value = "id") Long id);
+
+    /**
+     * 导入-选择菜单分页查询（查询当前租户级（当前所属租户绑定的菜单）或者系统级（全局菜单在任何地方都适用导入绑定）的菜单表数据）
+     * @param request
+     * @return
+     */
+    @PostMapping("/select/menu/page")
+    Result selectMenuPage(@Validated @RequestBody ApiRelTenantMenuSelectPageRequest request);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/reltenantproject/ApiRelTenantProjectFeignClient.java

-package com.yd.user.feign.client.reltenantproject;public class ApiRelTenantProjectFeignClient {
+package com.yd.user.feign.client.reltenantproject;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.reltenantproject.ApiRelTenantProjectFeignFallbackFactory;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户服务：租户-项目关系信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelTenantProjectFeignFallbackFactory.class)
+public interface ApiRelTenantProjectFeignClient {
+
+    /**
+     * 租户和项目关系分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiRelTenantProjectListPageRequest request);
+
+    /**
+     * 添加租户和项目列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/project/list")
+    Result addProjectList(@Validated @RequestBody ApiRelTenantProjectListAddRequest request);
+
+    /**
+     * 删除租户和项目关系
+     * @param id 租户和项目关系表主键id
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@NotNull(message = "租户和项目关系表主键id不能为空") @RequestParam(value = "id") Long id);
+
+
+    /**
+     * 导入-选择项目分页查询（查询当前租户级（当前所属租户绑定的项目）或者系统级（全局项目在任何地方都适用导入绑定）的项目表数据）
+     * @param request
+     * @return
+     */
+    @PostMapping("/select/project/page")
+    Result selectProjectPage(@RequestBody ApiRelTenantProjectSelectPageRequest request);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/reltenantrole/ApiRelTenantRoleFeignClient.java

-package com.yd.user.feign.client.reltenantrole;public interface ApiRelTenantRoleFeignClient {
+package com.yd.user.feign.client.reltenantrole;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.reltenantrole.ApiRelTenantRoleFeignFallbackFactory;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListAddRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListPageRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleSelectPageRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户服务：租户-角色关系信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelTenantRoleFeignFallbackFactory.class)
+public interface ApiRelTenantRoleFeignClient {
+
+
+    /**
+     * 租户和角色关系分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiRelTenantRoleListPageRequest request);
+
+    /**
+     * 添加租户和角色列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/role/list")
+    Result addRoleList(@Validated @RequestBody ApiRelTenantRoleListAddRequest request);
+
+    /**
+     * 删除租户和角色关系
+     * @param id 租户和角色关系表主键id
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@NotNull(message = "租户和角色关系表主键id不能为空") @RequestParam(value = "id") Long id);
+
+    /**
+     * 导入-选择角色分页查询（查询当前租户级（当前所属租户绑定的角色）或者系统级（全局角色在任何地方都适用导入绑定）的角色表数据）
+     * @param request
+     * @return
+     */
+    @PostMapping("/select/role/page")
+    Result selectRolePage(@Validated @RequestBody ApiRelTenantRoleSelectPageRequest request);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/reltenantuser/ApiRelTenantUserFeignClient.java

-package com.yd.user.feign.client.reltenantuser;public class ApiRelTenantUserFeignClient {
+package com.yd.user.feign.client.reltenantuser;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.reltenantuser.ApiRelTenantUserFeignFallbackFactory;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListAddRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListPageRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserSelectPageRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户服务：租户-用户关系信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelTenantUserFeignFallbackFactory.class)
+public interface ApiRelTenantUserFeignClient {
+
+    /**
+     * 租户和用户关系分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@Validated @RequestBody ApiRelTenantUserListPageRequest request);
+
+    /**
+     * 添加租户和用户列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/user/list")
+    Result addUserList(@Validated @RequestBody ApiRelTenantUserListAddRequest request);
+
+    /**
+     * 删除租户和用户关系
+     * @param id 租户和用户关系表主键id
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@NotNull(message = "租户和用户关系表主键id不能为空") @RequestParam(value = "id") Long id);
+
+    /**
+     * 导入-选择用户分页查询（查询用户库的用户id不在当前租户用户关系的用户id列表中的数据）
+     * @param request
+     * @return
+     */
+    @PostMapping("/select/user/page")
+    Result selectUserPage(@Validated @RequestBody ApiRelTenantUserSelectPageRequest request);
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/reluserrole/ApiRelUserRoleFeignClient.java

-package com.yd.user.feign.client.reluserrole;public interface ApiRelUserRoleFeignClient {
+package com.yd.user.feign.client.reluserrole;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.reluserrole.ApiRelUserRoleFeignFallbackFactory;
+import com.yd.user.feign.request.reluserrole.ApiProjectUserRoleListAddRequest;
+import com.yd.user.feign.request.reluserrole.ApiTenantUserRoleListAddRequest;
+import com.yd.user.feign.response.reluserrole.ApiSelectedProjectUserRoleListResponse;
+import com.yd.user.feign.response.reluserrole.ApiSelectedTenantUserRoleListResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 用户服务：用户-角色关系信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelUserRoleFeignFallbackFactory.class)
+public interface ApiRelUserRoleFeignClient {
+
+    /**
+     * 租户管理-用户配置-权限配置-添加用户角色列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/tenant/userRoleList")
+    Result addTenantUserRoleList(@Validated @RequestBody ApiTenantUserRoleListAddRequest request);
+
+    /**
+     * 租户管理-用户配置-权限配置-查询选中的角色列表
+     * @return
+     */
+    @GetMapping("/selected/tenant/userRoleList")
+    Result<List<ApiSelectedTenantUserRoleListResponse>> selectedTenantUserRoleList(@NotBlank(message = "租户唯一标识(业务ID)不能为空") @RequestParam(value = "tenantBizId") String tenantBizId,
+                                                                                   @NotBlank(message = "用户ID（业务id）不能为空") @RequestParam(value = "userBizId") String userBizId);
+
+    /**
+     * 项目管理-用户配置-权限配置-添加用户角色列表关系
+     * @param request
+     * @return
+     */
+    @PostMapping("/add/project/userRoleList")
+    Result addProjectUserRoleList(@Validated @RequestBody ApiProjectUserRoleListAddRequest request);
+
+    /**
+     * 项目管理-用户配置-权限配置-查询选中的角色列表
+     * @return
+     */
+    @GetMapping("/selected/project/userRoleList")
+    Result<List<ApiSelectedProjectUserRoleListResponse>> selectedProjectUserRoleList(@NotBlank(message = "项目唯一标识(业务ID)不能为空") @RequestParam(value = "projectBizId") String projectBizId,
+                                                                                     @NotBlank(message = "用户ID（业务id）不能为空") @RequestParam(value = "userBizId") String userBizId);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/sysmenu/ApiSysMenuFeignClient.java

-package com.yd.user.feign.client.sysmenu;public class ApiSysMenuFeignClient {
+package com.yd.user.feign.client.sysmenu;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.fallback.sysmenu.ApiSysMenuFeignFallbackFactory;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuAddRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuEditRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuPageRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuTreeListRequest;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuDetailResponse;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuTreeListResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 用户服务：菜单信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", fallbackFactory = ApiSysMenuFeignFallbackFactory.class)
+public interface ApiSysMenuFeignClient {
+
+    /**
+     * 树形菜单列表查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/tree/list")
+    Result<List<ApiSysMenuTreeListResponse>> treeList(@RequestBody ApiSysMenuTreeListRequest request);
+
+    /**
+     * 菜单分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiSysMenuPageRequest request);
+
+    /**
+     * 获取菜单详情
+     * @param menuBizId 菜单唯一标识(业务ID)
+     * @return
+     */
+    @GetMapping("/detail")
+    Result<ApiSysMenuDetailResponse> detail(@NotBlank(message = "菜单唯一标识(业务ID)不能为空") @RequestParam(value = "menuBizId") String menuBizId);
+
+    /**
+     * 添加菜单
+     * @param request
+     * @return
+     */
+    @PostMapping("/add")
+    Result add(@Validated @RequestBody ApiSysMenuAddRequest request);
+
+    /**
+     * 编辑菜单
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiSysMenuEditRequest request);
+
+
+    /**
+     * 删除菜单（逻辑删除）
+     * @param menuBizId 菜单唯一标识(业务ID)
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@NotBlank(message = "菜单唯一标识(业务ID)不能为空") @RequestParam(value = "menuBizId") String menuBizId);
+
+    /**
+     * 编辑菜单状态
+     * @param menuBizId 菜单唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "菜单唯一标识(业务ID)不能为空") @RequestParam(value = "menuBizId") String menuBizId,
+                      @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/sysproject/ApiSysProjectFeignClient.java

@@ -7,8 +7,12 @@ import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
 import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
 import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
 import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
 import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
 /**
  * 用户服务-系统项目信息Feign客户端
  * 用户服务-系统项目信息Feign客户端
  */
  */
@@ -25,11 +29,11 @@ public interface ApiSysProjectFeignClient {
 
 
     /**
     /**
      * 获取项目详情
      * 获取项目详情
-     * @param projectUid 项目唯一标识(业务ID)
+     * @param projectBizId 项目唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @GetMapping("/detail")
     @GetMapping("/detail")
-    Result<ApiSysProjectDetailResponse> detail(@RequestParam(value = "projectUid") String projectUid);
+    Result<ApiSysProjectDetailResponse> detail(@NotBlank(message = "项目唯一标识(业务ID)不能为空") @RequestParam(value = "projectBizId") String projectBizId);
 
 
     /**
     /**
      * 添加项目
      * 添加项目
@@ -37,33 +41,33 @@ public interface ApiSysProjectFeignClient {
      * @return
      * @return
      */
      */
     @PostMapping("/add")
     @PostMapping("/add")
-    Result add(@RequestBody ApiSysProjectAddRequest request);
+    Result add(@Validated @RequestBody ApiSysProjectAddRequest request);
 
 
     /**
     /**
      * 编辑项目
      * 编辑项目
      * @param request
      * @param request
      * @return
      * @return
      */
      */
-    @PostMapping("/edit")
-    Result edit(@RequestBody ApiSysProjectEditRequest request);
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiSysProjectEditRequest request);
 
 
 
 
     /**
     /**
      * 删除项目（逻辑删除）
      * 删除项目（逻辑删除）
-     * @param projectUid 项目唯一标识(业务ID)
+     * @param projectBizId 项目唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @DeleteMapping("/del")
     @DeleteMapping("/del")
-    Result del(@RequestParam(value = "projectUid") String projectUid);
+    Result del(@RequestParam(value = "projectBizId") String projectBizId);
 
 
     /**
     /**
      * 编辑项目状态
      * 编辑项目状态
-     * @param projectUid 项目唯一标识(业务ID)
+     * @param projectBizId 项目唯一标识(业务ID)
      * @param status 状态(0:禁用 1:启用)
      * @param status 状态(0:禁用 1:启用)
      * @return
      * @return
      */
      */
-    @DeleteMapping("/edit/status")
-    Result editStatus(@RequestParam(value = "projectUid") String projectUid,
-                      @RequestParam(value = "status") Integer status);
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "项目唯一标识(业务ID)不能为空") @RequestParam(value = "projectBizId") String projectBizId,
+                      @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
 
 
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/sysrole/ApiSysRoleFeignClient.java

@@ -7,8 +7,12 @@ import com.yd.user.feign.request.sysrole.ApiSysRoleEditRequest;
 import com.yd.user.feign.request.sysrole.ApiSysRolePageRequest;
 import com.yd.user.feign.request.sysrole.ApiSysRolePageRequest;
 import com.yd.user.feign.response.sysrole.ApiSysRoleDetailResponse;
 import com.yd.user.feign.response.sysrole.ApiSysRoleDetailResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
 /**
  * 用户服务-系统角色信息Feign客户端
  * 用户服务-系统角色信息Feign客户端
  */
  */
@@ -25,11 +29,11 @@ public interface ApiSysRoleFeignClient {
 
 
     /**
     /**
      * 获取角色详情
      * 获取角色详情
-     * @param roleUid 角色唯一标识(业务ID)
+     * @param roleBizId 角色唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @GetMapping("/detail")
     @GetMapping("/detail")
-    Result<ApiSysRoleDetailResponse> detail(@RequestParam(value = "roleUid") String roleUid);
+    Result<ApiSysRoleDetailResponse> detail(@NotBlank(message = "角色唯一标识(业务ID)不能为空") @RequestParam(value = "roleBizId") String roleBizId);
 
 
     /**
     /**
      * 添加角色
      * 添加角色
@@ -37,32 +41,32 @@ public interface ApiSysRoleFeignClient {
      * @return
      * @return
      */
      */
     @PostMapping("/add")
     @PostMapping("/add")
-    Result add(@RequestBody ApiSysRoleAddRequest request);
+    Result add(@Validated @RequestBody ApiSysRoleAddRequest request);
 
 
     /**
     /**
      * 编辑角色
      * 编辑角色
      * @param request
      * @param request
      * @return
      * @return
      */
      */
-    @PostMapping("/edit")
-    Result edit(@RequestBody ApiSysRoleEditRequest request);
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiSysRoleEditRequest request);
 
 
 
 
     /**
     /**
      * 删除角色（逻辑删除）
      * 删除角色（逻辑删除）
-     * @param roleUid 角色唯一标识(业务ID)
+     * @param roleBizId 角色唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @DeleteMapping("/del")
     @DeleteMapping("/del")
-    Result del(@RequestParam(value = "roleUid") String roleUid);
+    Result del(@RequestParam(value = "roleBizId") String roleBizId);
 
 
     /**
     /**
      * 编辑角色状态
      * 编辑角色状态
-     * @param roleUid 角色唯一标识(业务ID)
+     * @param roleBizId 角色唯一标识(业务ID)
      * @param status 状态(0:禁用 1:启用)
      * @param status 状态(0:禁用 1:启用)
      * @return
      * @return
      */
      */
-    @DeleteMapping("/edit/status")
-    Result editStatus(@RequestParam(value = "roleUid") String roleUid,
-                      @RequestParam(value = "status") Integer status);
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "角色唯一标识(业务ID)不能为空") @RequestParam(value = "roleBizId") String roleBizId,
+                      @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/systenant/ApiSysTenantFeignClient.java

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 
 /**
 /**
  * 用户服务-系统租户信息Feign客户端
  * 用户服务-系统租户信息Feign客户端
@@ -27,11 +28,11 @@ public interface ApiSysTenantFeignClient {
 
 
     /**
     /**
      * 获取租户详情
      * 获取租户详情
-     * @param tenantUid 租户唯一标识(业务ID)
+     * @param tenantBizId 租户唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @GetMapping("/detail")
     @GetMapping("/detail")
-    Result<ApiSysTenantDetailResponse> detail(@NotBlank(message = "租户唯一标识(业务ID)不能为空") @RequestParam(value = "tenantUid") String tenantUid);
+    Result<ApiSysTenantDetailResponse> detail(@NotBlank(message = "租户唯一标识(业务ID)不能为空") @RequestParam(value = "tenantBizId") String tenantBizId);
 
 
     /**
     /**
      * 添加租户
      * 添加租户
@@ -46,25 +47,25 @@ public interface ApiSysTenantFeignClient {
      * @param request
      * @param request
      * @return
      * @return
      */
      */
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     Result edit(@RequestBody ApiSysTenantEditRequest request);
     Result edit(@RequestBody ApiSysTenantEditRequest request);
 
 
 
 
     /**
     /**
      * 删除租户（逻辑删除）
      * 删除租户（逻辑删除）
-     * @param tenantUid 租户唯一标识(业务ID)
+     * @param tenantBizId 租户唯一标识(业务ID)
      * @return
      * @return
      */
      */
     @DeleteMapping("/del")
     @DeleteMapping("/del")
-    Result del(@RequestParam(value = "tenantUid") String tenantUid);
+    Result del(@RequestParam(value = "tenantBizId") String tenantBizId);
 
 
     /**
     /**
      * 编辑租户状态
      * 编辑租户状态
-     * @param tenantUid 租户唯一标识(业务ID)
+     * @param tenantBizId 租户唯一标识(业务ID)
      * @param status 状态(0:禁用 1:启用)
      * @param status 状态(0:禁用 1:启用)
      * @return
      * @return
      */
      */
-    @DeleteMapping("/edit/status")
-    Result editStatus(@RequestParam(value = "tenantUid") String tenantUid,
-                      @RequestParam(value = "status") Integer status);
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "租户唯一标识(业务ID)不能为空") @RequestParam(value = "tenantBizId") String tenantBizId,
+                      @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/client/sysuser/ApiSysUserFeignClient.java

@@ -3,14 +3,16 @@ package com.yd.user.feign.client.sysuser;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.user.feign.fallback.sysuser.ApiSysUserFeignFallbackFactory;
 import com.yd.user.feign.fallback.sysuser.ApiSysUserFeignFallbackFactory;
 import com.yd.user.feign.request.sysuser.ApiSysUserAddRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserAddRequest;
+import com.yd.user.feign.request.sysuser.ApiSysUserEditPwdRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserEditRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserEditRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserPageRequest;
 import com.yd.user.feign.request.sysuser.ApiSysUserPageRequest;
 import com.yd.user.feign.response.sysuser.ApiSysUserDetailResponse;
 import com.yd.user.feign.response.sysuser.ApiSysUserDetailResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 
 /**
 /**
  * 用户服务-系统用户信息Feign客户端
  * 用户服务-系统用户信息Feign客户端
@@ -32,21 +34,38 @@ public interface ApiSysUserFeignClient {
      * @return
      * @return
      */
      */
     @PostMapping("/add")
     @PostMapping("/add")
-    Result add(@RequestBody ApiSysUserAddRequest request);
+    Result add(@Validated @RequestBody ApiSysUserAddRequest request);
 
 
     /**
     /**
      * 编辑用户
      * 编辑用户
      * @param request
      * @param request
      * @return
      * @return
      */
      */
-    @PostMapping("/edit")
-    Result edit(@RequestBody ApiSysUserEditRequest request);
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiSysUserEditRequest request);
 
 
     /**
     /**
      * 获取用户详情
      * 获取用户详情
-     * @param userUid 用户业务唯一标识id
+     * @param userBizId 用户业务唯一标识id
      * @return
      * @return
      */
      */
     @GetMapping("/detail")
     @GetMapping("/detail")
-    Result<ApiSysUserDetailResponse> detail(@RequestParam(value = "userUid") String userUid);
+    Result<ApiSysUserDetailResponse> detail(@NotBlank(message = "用户业务唯一标识id不能为空") @RequestParam(value = "userBizId") String userBizId);
+
+    /**
+     * 编辑用户状态
+     * @param userBizId
+     * @param status
+     * @return
+     */
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "用户唯一标识(业务ID)不能为空") @RequestParam(value = "userBizId") String userBizId,
+                      @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
+
+    /**
+     * 编辑用户密码
+     * @return
+     */
+    @PostMapping("/edit/pwd")
+    Result editPwd(@Validated @RequestBody ApiSysUserEditPwdRequest request);
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/relprojectrole/ApiRelProjectRoleFeignFallbackFactory.java

-package com.yd.user.feign.fallback.relprojectrole;public class ApiRelProjectRoleFeignFallbackFactory {
+package com.yd.user.feign.fallback.relprojectrole;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.relprojectrole.ApiRelProjectRoleFeignClient;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListAddRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleListPageRequest;
+import com.yd.user.feign.request.relprojectrole.ApiRelProjectRoleSelectPageRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户服务：项目-角色关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelProjectRoleFeignFallbackFactory implements FallbackFactory<ApiRelProjectRoleFeignClient> {
+    @Override
+    public ApiRelProjectRoleFeignClient create(Throwable cause) {
+        return new ApiRelProjectRoleFeignClient() {
+            @Override
+            public Result page(ApiRelProjectRoleListPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result addRoleList(ApiRelProjectRoleListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(Long id) {
+                return null;
+            }
+
+            @Override
+            public Result selectRolePage(ApiRelProjectRoleSelectPageRequest request) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/relprojectuser/ApiRelProjectUserFeignFallbackFactory.java

-package com.yd.user.feign.fallback.relprojectuser;public class ApiRelProjectUserFeignFallbackFactory {
+package com.yd.user.feign.fallback.relprojectuser;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.relprojectuser.ApiRelProjectUserFeignClient;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListAddRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListPageRequest;
+import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserSelectPageRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户服务：项目-用户关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelProjectUserFeignFallbackFactory implements FallbackFactory<ApiRelProjectUserFeignClient> {
+    @Override
+    public ApiRelProjectUserFeignClient create(Throwable cause) {
+        return new ApiRelProjectUserFeignClient() {
+            @Override
+            public Result page(ApiRelProjectUserListPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result addUserList(ApiRelProjectUserListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(Long id) {
+                return null;
+            }
+
+            @Override
+            public Result selectUserPage(ApiRelProjectUserSelectPageRequest request) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/reltenantmenu/ApiRelTenantMenuFeignFallbackFactory.java

-package com.yd.user.feign.fallback.reltenantmenu;public class ApiRelTenantMenuFeignFallbackFactory {
+package com.yd.user.feign.fallback.reltenantmenu;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.reltenantmenu.ApiRelTenantMenuFeignClient;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListAddRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuListPageRequest;
+import com.yd.user.feign.request.reltenantmenu.ApiRelTenantMenuSelectPageRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户服务：租户-菜单关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelTenantMenuFeignFallbackFactory implements FallbackFactory<ApiRelTenantMenuFeignClient> {
+    @Override
+    public ApiRelTenantMenuFeignClient create(Throwable cause) {
+        return new ApiRelTenantMenuFeignClient() {
+            @Override
+            public Result page(ApiRelTenantMenuListPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result addMenuList(ApiRelTenantMenuListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(Long id) {
+                return null;
+            }
+
+            @Override
+            public Result selectMenuPage(ApiRelTenantMenuSelectPageRequest request) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/reltenantproject/ApiRelTenantProjectFeignFallbackFactory.java

-package com.yd.user.feign.fallback.reltenantproject;public class ApiRelTenantProjectFeignFallbackFactory {
+package com.yd.user.feign.fallback.reltenantproject;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.reltenantproject.ApiRelTenantProjectFeignClient;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
+import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户服务：租户-项目关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelTenantProjectFeignFallbackFactory implements FallbackFactory<ApiRelTenantProjectFeignClient> {
+    @Override
+    public ApiRelTenantProjectFeignClient create(Throwable cause) {
+        return new ApiRelTenantProjectFeignClient() {
+            @Override
+            public Result page(ApiRelTenantProjectListPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result addProjectList(ApiRelTenantProjectListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(Long id) {
+                return null;
+            }
+
+            @Override
+            public Result selectProjectPage(ApiRelTenantProjectSelectPageRequest request) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/reltenantrole/ApiRelTenantRoleFeignFallbackFactory.java

-package com.yd.user.feign.fallback.reltenantrole;public class ApiRelTenantRoleFeignFallbackFactory {
+package com.yd.user.feign.fallback.reltenantrole;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.reltenantrole.ApiRelTenantRoleFeignClient;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListAddRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleListPageRequest;
+import com.yd.user.feign.request.reltenantrole.ApiRelTenantRoleSelectPageRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户服务：租户-角色关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelTenantRoleFeignFallbackFactory implements FallbackFactory<ApiRelTenantRoleFeignClient> {
+    @Override
+    public ApiRelTenantRoleFeignClient create(Throwable cause) {
+        return new ApiRelTenantRoleFeignClient() {
+            @Override
+            public Result page(ApiRelTenantRoleListPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result addRoleList(ApiRelTenantRoleListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(Long id) {
+                return null;
+            }
+
+            @Override
+            public Result selectRolePage(ApiRelTenantRoleSelectPageRequest request) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/reltenantuser/ApiRelTenantUserFeignFallbackFactory.java

-package com.yd.user.feign.fallback.reltenantuser;public class ApiRelTenantUserFeignFallbackFactory {
+package com.yd.user.feign.fallback.reltenantuser;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.reltenantuser.ApiRelTenantUserFeignClient;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListAddRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserListPageRequest;
+import com.yd.user.feign.request.reltenantuser.ApiRelTenantUserSelectPageRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户服务：租户-用户关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelTenantUserFeignFallbackFactory implements FallbackFactory<ApiRelTenantUserFeignClient> {
+    @Override
+    public ApiRelTenantUserFeignClient create(Throwable cause) {
+        return new ApiRelTenantUserFeignClient() {
+            @Override
+            public Result page(ApiRelTenantUserListPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result addUserList(ApiRelTenantUserListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(Long id) {
+                return null;
+            }
+
+            @Override
+            public Result selectUserPage(ApiRelTenantUserSelectPageRequest request) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/reluserrole/ApiRelUserRoleFeignFallbackFactory.java

-package com.yd.user.feign.fallback.reluserrole;public class ApiRelUserRoleFeignFallbackFactory {
+package com.yd.user.feign.fallback.reluserrole;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.reluserrole.ApiRelUserRoleFeignClient;
+import com.yd.user.feign.request.reluserrole.ApiProjectUserRoleListAddRequest;
+import com.yd.user.feign.request.reluserrole.ApiTenantUserRoleListAddRequest;
+import com.yd.user.feign.response.reluserrole.ApiSelectedTenantUserRoleListResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 用户服务：用户-角色关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelUserRoleFeignFallbackFactory implements FallbackFactory<ApiRelUserRoleFeignClient> {
+    @Override
+    public ApiRelUserRoleFeignClient create(Throwable cause) {
+        return new ApiRelUserRoleFeignClient() {
+            @Override
+            public Result addTenantUserRoleList(ApiTenantUserRoleListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<List<ApiSelectedTenantUserRoleListResponse>> selectedTenantUserRoleList(String tenantBizId, String userBizId) {
+                return null;
+            }
+
+            @Override
+            public Result addProjectUserRoleList(ApiProjectUserRoleListAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result selectedProjectUserRoleList(String projectBizId,String userBizId) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/sysmenu/ApiSysMenuFeignFallbackFactory.java

-package com.yd.user.feign.fallback.sysmenu;public class ApiSysMenuFeignFallbackFactory {
+package com.yd.user.feign.fallback.sysmenu;
+
+import com.yd.common.result.Result;
+import com.yd.user.feign.client.sysmenu.ApiSysMenuFeignClient;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuAddRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuEditRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuPageRequest;
+import com.yd.user.feign.request.sysmenu.ApiSysMenuTreeListRequest;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuDetailResponse;
+import com.yd.user.feign.response.sysmenu.ApiSysMenuTreeListResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 用户服务：菜单关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiSysMenuFeignFallbackFactory implements FallbackFactory<ApiSysMenuFeignClient> {
+    @Override
+    public ApiSysMenuFeignClient create(Throwable cause) {
+        return new ApiSysMenuFeignClient() {
+            @Override
+            public Result<List<ApiSysMenuTreeListResponse>> treeList(ApiSysMenuTreeListRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result page(ApiSysMenuPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiSysMenuDetailResponse> detail(String menuBizId) {
+                return null;
+            }
+
+            @Override
+            public Result add(ApiSysMenuAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result edit(ApiSysMenuEditRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(String menuBizId) {
+                return null;
+            }
+
+            @Override
+            public Result editStatus(String menuBizId,Integer status) {
+                return null;
+            }
+        };
+    }
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/sysproject/ApiSysProjectFeignFallbackFactory.java

@@ -25,7 +25,7 @@ public class ApiSysProjectFeignFallbackFactory implements FallbackFactory<ApiSys
             }
             }
 
 
             @Override
             @Override
-            public Result<ApiSysProjectDetailResponse> detail(String projectUid) {
+            public Result<ApiSysProjectDetailResponse> detail(String projectBizId) {
                 return null;
                 return null;
             }
             }
 
 
@@ -40,12 +40,12 @@ public class ApiSysProjectFeignFallbackFactory implements FallbackFactory<ApiSys
             }
             }
 
 
             @Override
             @Override
-            public Result del(String projectUid) {
+            public Result del(String projectBizId) {
                 return null;
                 return null;
             }
             }
 
 
             @Override
             @Override
-            public Result editStatus(String projectUid, Integer status) {
+            public Result editStatus(String projectBizId, Integer status) {
                 return null;
                 return null;
             }
             }
         };
         };

yd-user-feign/src/main/java/com/yd/user/feign/fallback/sysrole/ApiSysRoleFeignFallbackFactory.java

@@ -25,7 +25,7 @@ public class ApiSysRoleFeignFallbackFactory implements FallbackFactory<ApiSysRol
             }
             }
 
 
             @Override
             @Override
-            public Result<ApiSysRoleDetailResponse> detail(String roleUid) {
+            public Result<ApiSysRoleDetailResponse> detail(String roleBizId) {
                 return null;
                 return null;
             }
             }
 
 
@@ -40,12 +40,12 @@ public class ApiSysRoleFeignFallbackFactory implements FallbackFactory<ApiSysRol
             }
             }
 
 
             @Override
             @Override
-            public Result del(String roleUid) {
+            public Result del(String roleBizId) {
                 return null;
                 return null;
             }
             }
 
 
             @Override
             @Override
-            public Result editStatus(String roleUid, Integer status) {
+            public Result editStatus(String roleBizId, Integer status) {
                 return null;
                 return null;
             }
             }
         };
         };

yd-user-feign/src/main/java/com/yd/user/feign/fallback/systenant/ApiSysTenantFeignFallbackFactory.java

@@ -25,7 +25,7 @@ public class ApiSysTenantFeignFallbackFactory implements FallbackFactory<ApiSysT
             }
             }
 
 
             @Override
             @Override
-            public Result<ApiSysTenantDetailResponse> detail(String tenantUid) {
+            public Result<ApiSysTenantDetailResponse> detail(String tenantBizId) {
                 return null;
                 return null;
             }
             }
 
 
@@ -40,12 +40,12 @@ public class ApiSysTenantFeignFallbackFactory implements FallbackFactory<ApiSysT
             }
             }
 
 
             @Override
             @Override
-            public Result del(String tenantUid) {
+            public Result del(String tenantBizId) {
                 return null;
                 return null;
             }
             }
 
 
             @Override
             @Override
-            public Result editStatus(String tenantUid, Integer status) {
+            public Result editStatus(String tenantBizId, Integer status) {
                 return null;
                 return null;
             }
             }
         };
         };

yd-user-feign/src/main/java/com/yd/user/feign/fallback/sysuser/ApiSysUserFeignFallbackFactory.java

@@ -40,7 +40,7 @@ public class ApiSysUserFeignFallbackFactory implements FallbackFactory<ApiSysUse
             }
             }
 
 
             @Override
             @Override
-            public Result<ApiSysUserDetailResponse> detail(String userUid) {
+            public Result<ApiSysUserDetailResponse> detail(String userBizId) {
                 log.error("获取用户信息失败: {}", cause.getMessage());
                 log.error("获取用户信息失败: {}", cause.getMessage());
                 throw new BusinessException("获取用户信息失败，请稍后重试");
                 throw new BusinessException("获取用户信息失败，请稍后重试");
             }
             }

yd-user-feign/src/main/java/com/yd/user/feign/request/relprojectrole/ApiRelProjectRoleListAddRequest.java

-package com.yd.user.feign.request.relprojectrole;public class ApiRelProjectRoleListAddRequest {
+package com.yd.user.feign.request.relprojectrole;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 添加项目和角色列表关系入参
+ */
+@Data
+public class ApiRelProjectRoleListAddRequest {
+    
+    /**
+     * 项目唯一标识(业务ID)
+     */
+    @NotBlank(message = "项目唯一标识(业务ID)不能为空")
+    private String projectBizId;
+
+    /**
+     * 角色唯一标识(业务ID) 列表（选中列表）
+     */
+    @NotEmpty(message = "角色唯一标识(业务ID) 列表（选中列表）不能为空")
+    private List<String> roleBizIdList;
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/relprojectrole/ApiRelProjectRoleListPageRequest.java

-package com.yd.user.feign.request.relprojectrole;public class ApiRelProjectRoleListPageRequest {
+package com.yd.user.feign.request.relprojectrole;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 项目和角色关系分页查询入参
+ */
+@Data
+public class ApiRelProjectRoleListPageRequest extends PageDto {
+
+    /**
+     * 项目唯一标识(业务ID)
+     */
+    @NotBlank(message = "项目唯一标识(业务ID)不能为空")
+    private String projectBizId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/relprojectrole/ApiRelProjectRoleSelectPageRequest.java

-package com.yd.user.feign.request.relprojectrole;public class ApiRelProjectRoleSelectPageRequest {
+package com.yd.user.feign.request.relprojectrole;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 导入-选择角色分页查询（查询当前项目级（当前所属项目绑定的角色）或者系统级（全局角色在任何地方都适用导入绑定）的角色表数据）入参
+ */
+@Data
+public class ApiRelProjectRoleSelectPageRequest extends PageDto {
+
+    /**
+     * 项目唯一标识(业务ID)
+     */
+    @NotBlank(message = "项目唯一标识(业务ID)不能为空")
+    private String projectBizId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/relprojectuser/ApiRelProjectUserListAddRequest.java

-package com.yd.user.feign.request.relprojectuser;public class ApiRelProjectUserListAddRequest {
+package com.yd.user.feign.request.relprojectuser;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 添加项目和用户列表关系入参
+ */
+@Data
+public class ApiRelProjectUserListAddRequest {
+
+    /**
+     * 项目ID（业务id）
+     */
+    @NotBlank(message = "项目ID（业务id）不能为空")
+    private String projectBizId;
+
+    /**
+     * 选择的用户ID（业务id）列表
+     */
+    @NotEmpty(message = "选择的用户ID（业务id）列表不能为空")
+    private List<String> userBizIdList;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/relprojectuser/ApiRelProjectUserListPageRequest.java

-package com.yd.user.feign.request.relprojectuser;public class ApiRelProjectUserListPageRequest {
+package com.yd.user.feign.request.relprojectuser;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 项目和用户关系分页查询入参
+ */
+@Data
+public class ApiRelProjectUserListPageRequest extends PageDto {
+
+    /**
+     * 项目唯一标识(业务ID)
+     */
+    @NotBlank(message = "项目唯一标识(业务ID)不能为空")
+    private String projectBizId;
+
+    /**
+     * 登录账号
+     */
+    private String userName;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/relprojectuser/ApiRelProjectUserSelectPageRequest.java

-package com.yd.user.feign.request.relprojectuser;public class ApiRelProjectUserSelectPageRequest {
+package com.yd.user.feign.request.relprojectuser;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 导入-选择用户分页查询（查询用户库的用户id不在当前项目用户关系的用户id列表中的数据）入参
+ */
+@Data
+public class ApiRelProjectUserSelectPageRequest extends PageDto {
+
+
+    /**
+     * 项目唯一标识(业务ID)
+     */
+    @NotBlank(message = "项目唯一标识(业务ID)不能为空")
+    private String projectBizId;
+
+    /**
+     * 登录账号
+     */
+    private String userName;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantmenu/ApiRelTenantMenuListAddRequest.java

-package com.yd.user.feign.request.reltenantmenu;public class ApiRelTenantMenuListAddRequest {
+package com.yd.user.feign.request.reltenantmenu;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 添加租户和菜单列表关系入参
+ */
+@Data
+public class ApiRelTenantMenuListAddRequest {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 菜单唯一标识(业务ID) 列表（选中列表）
+     */
+    @NotEmpty(message = "菜单唯一标识(业务ID) 列表（选中列表）不能为空")
+    private List<String> menuBizIdList;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantmenu/ApiRelTenantMenuListPageRequest.java

-package com.yd.user.feign.request.reltenantmenu;public class ApiRelTenantMenuListPageRequest {
+package com.yd.user.feign.request.reltenantmenu;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 租户和菜单关系分页查询入参
+ */
+@Data
+public class ApiRelTenantMenuListPageRequest extends PageDto {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantmenu/ApiRelTenantMenuSelectPageRequest.java

-package com.yd.user.feign.request.reltenantmenu;public class ApiRelTenantMenuSelectPageRequest {
+package com.yd.user.feign.request.reltenantmenu;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 导入-选择菜单分页查询（查询当前租户级（当前所属租户绑定的菜单）或者系统级（全局菜单在任何地方都适用导入绑定）的菜单表数据）入参
+ */
+@Data
+public class ApiRelTenantMenuSelectPageRequest extends PageDto {
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantproject/ApiRelTenantProjectListAddRequest.java

-package com.yd.user.feign.request.reltenantproject;public class ApiRelTenantProjectListAddRequest {
+package com.yd.user.feign.request.reltenantproject;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 添加租户和项目列表关系入参
+ */
+@Data
+public class ApiRelTenantProjectListAddRequest {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 项目唯一标识(业务ID) 列表（选中列表）
+     */
+    @NotEmpty(message = "项目唯一标识(业务ID) 列表（选中列表）不能为空")
+    private List<String> projectBizIdList;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantproject/ApiRelTenantProjectListPageRequest.java

-package com.yd.user.feign.request.reltenantproject;public class ApiRelTenantProjectListPageRequest {
+package com.yd.user.feign.request.reltenantproject;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 租户和项目关系分页查询入参
+ */
+@Data
+public class ApiRelTenantProjectListPageRequest extends PageDto {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantproject/ApiRelTenantProjectSelectPageRequest.java

-package com.yd.user.feign.request.reltenantproject;public class ApiRelTenantProjectSelectPageRequest {
+package com.yd.user.feign.request.reltenantproject;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 导入-选择项目分页查询入参
+ */
+@Data
+public class ApiRelTenantProjectSelectPageRequest extends PageDto {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantrole/ApiRelTenantRoleListAddRequest.java

-package com.yd.user.feign.request.reltenantrole;public class ApiRelTenantRoleListAddRequest {
+package com.yd.user.feign.request.reltenantrole;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 添加租户和角色列表关系入参
+ */
+@Data
+public class ApiRelTenantRoleListAddRequest {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 角色唯一标识(业务ID) 列表（选中列表）
+     */
+    @NotEmpty(message = "角色唯一标识(业务ID) 列表（选中列表）不能为空")
+    private List<String> roleBizIdList;
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantrole/ApiRelTenantRoleListPageRequest.java

-package com.yd.user.feign.request.reltenantrole;public class ApiRelTenantRoleListPageRequest {
+package com.yd.user.feign.request.reltenantrole;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 租户和角色关系分页查询入参
+ */
+@Data
+public class ApiRelTenantRoleListPageRequest extends PageDto {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantrole/ApiRelTenantRoleSelectPageRequest.java

 package com.yd.user.feign.request.reltenantrole;
 package com.yd.user.feign.request.reltenantrole;
 
 
-public class ApiRelTenantRoleSelectPageRequest {
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiRelTenantRoleSelectPageRequest extends PageDto {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantuser/ApiRelTenantUserListAddRequest.java

-package com.yd.user.feign.request.reltenantuser;public class ApiRelTenantUserListAddRequest {
+package com.yd.user.feign.request.reltenantuser;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 添加租户和用户列表关系入参
+ */
+@Data
+public class ApiRelTenantUserListAddRequest {
+
+    /**
+     * 租户ID（业务id）
+     */
+    @NotBlank(message = "租户ID（业务id）不能为空")
+    private String tenantBizId;
+
+    /**
+     * 选择的用户ID（业务id）列表
+     */
+    @NotEmpty(message = "选择的用户ID（业务id）列表不能为空")
+    private List<String> userBizIdList;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantuser/ApiRelTenantUserListPageRequest.java

-package com.yd.user.feign.request.reltenantuser;public class ApiRelTenantUserListPageRequest {
+package com.yd.user.feign.request.reltenantuser;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 租户和用户关系分页查询入参
+ */
+@Data
+public class ApiRelTenantUserListPageRequest extends PageDto {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 登录账号
+     */
+    private String userName;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantuser/ApiRelTenantUserSelectPageRequest.java

-package com.yd.user.feign.request.reltenantuser;public class ApiRelTenantUserSelectPageRequest {
+package com.yd.user.feign.request.reltenantuser;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 导入-选择用户分页查询（查询用户库的用户id不在当前租户用户关系的用户id列表中的数据）入参
+ */
+@Data
+public class ApiRelTenantUserSelectPageRequest extends PageDto {
+
+    /**
+     * 租户唯一标识(业务ID)
+     */
+    @NotBlank(message = "租户唯一标识(业务ID)不能为空")
+    private String tenantBizId;
+
+    /**
+     * 登录账号
+     */
+    private String userName;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reluserrole/ApiProjectUserRoleListAddRequest.java

-package com.yd.user.feign.request.reluserrole;public class ApiProjectUserRoleListAddRequest {
+package com.yd.user.feign.request.reluserrole;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 项目管理-用户配置-权限配置-添加用户角色列表关系入参
+ */
+@Data
+public class ApiProjectUserRoleListAddRequest {
+
+    /**
+     * 项目ID（业务id）
+     */
+    @NotBlank(message = "项目ID（业务id）不能为空")
+    private String projectBizId;
+
+    /**
+     * 用户ID（业务id）
+     */
+    @NotBlank(message = "用户ID（业务id）不能为空")
+    private String userBizId;
+
+    /**
+     * 选择的角色ID（业务id）列表
+     */
+    @NotEmpty(message = "选择的角色ID（业务id）列表不能为空")
+    private List<String> roleBizIdList;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/reluserrole/ApiTenantUserRoleListAddRequest.java

-package com.yd.user.feign.request.reluserrole;public class ApiTenantUserRoleListAddRequest {
+package com.yd.user.feign.request.reluserrole;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 租户管理-添加用户角色列表关系
+ */
+@Data
+public class ApiTenantUserRoleListAddRequest {
+
+    /**
+     * 租户ID（业务id）
+     */
+    @NotBlank(message = "租户ID（业务id）不能为空")
+    private String tenantBizId;
+
+    /**
+     * 用户ID（业务id）
+     */
+    @NotBlank(message = "用户ID（业务id）不能为空")
+    private String userBizId;
+
+    /**
+     * 选择的角色ID（业务id）列表
+     */
+    @NotEmpty(message = "选择的角色ID（业务id）列表不能为空")
+    private List<String> roleBizIdList;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/sysmenu/ApiSysMenuAddRequest.java

-package com.yd.user.feign.request.sysmenu;public class ApiSysMenuAddRequest {
+package com.yd.user.feign.request.sysmenu;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 添加菜单入参
+ */
+@Data
+public class ApiSysMenuAddRequest {
+
+    /**
+     * 父菜单ID
+     */
+    @NotNull(message = "父菜单ID不能为空")
+    private String parentBizId;
+
+    /**
+     * 菜单名称
+     */
+    @NotBlank(message = "菜单名称不能为空")
+    private String menuName;
+
+    /**
+     * 类型(1:目录 2:菜单 3:按钮)
+     */
+    @NotNull(message = "类型不能为空")
+    private Integer menuType;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 组件路径
+     */
+    private String component;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 是否外链(0:否 1:是)
+     */
+    private Integer isExternal;
+
+    /**
+     * 是否缓存(0:否 1:是)
+     */
+    private Integer isCache;
+
+    /**
+     * 是否显示(0:隐藏 1:显示)
+     */
+    private Integer isVisible;
+
+    /**
+     * 权限标识(如:user:add)
+     */
+    private String permission;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空")
+    private Integer orderNum;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 作用域(1:系统级（全局） 2:租户级 3:项目级)
+     */
+    @NotNull(message = "作用域不能为空")
+    private Integer scope;
+
+    /**
+     * 所属租户ID（业务id）
+     */
+    private String tenantBizId;
+
+    /**
+     * 所属项目ID（业务id）
+     */
+    private String projectBizId;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/sysmenu/ApiSysMenuEditRequest.java

-package com.yd.user.feign.request.sysmenu;public class ApiSysMenuEditRequest {
+package com.yd.user.feign.request.sysmenu;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 编辑菜单入参
+ */
+@Data
+public class ApiSysMenuEditRequest {
+
+    /**
+     * 菜单表主键id
+     */
+    @NotNull(message = "菜单表主键id不能为空")
+    private Long id;
+
+    /**
+     * 菜单唯一标识(业务ID)
+     */
+    @NotBlank(message = "菜单唯一标识(业务ID)不能为空")
+    private String menuBizId;
+
+    /**
+     * 父菜单ID
+     */
+    @NotNull(message = "父菜单ID不能为空")
+    private String parentBizId;
+
+    /**
+     * 菜单名称
+     */
+    @NotBlank(message = "菜单名称不能为空")
+    private String menuName;
+
+    /**
+     * 类型(1:目录 2:菜单 3:按钮)
+     */
+    @NotNull(message = "类型不能为空")
+    private Integer menuType;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 组件路径
+     */
+    private String component;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 是否外链(0:否 1:是)
+     */
+    private Integer isExternal;
+
+    /**
+     * 是否缓存(0:否 1:是)
+     */
+    private Integer isCache;
+
+    /**
+     * 是否显示(0:隐藏 1:显示)
+     */
+    private Integer isVisible;
+
+    /**
+     * 权限标识(如:user:add)
+     */
+    private String permission;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空")
+    private Integer orderNum;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 作用域(1:系统级（全局） 2:租户级 3:项目级)
+     */
+    @NotNull(message = "作用域不能为空")
+    private Integer scope;
+
+    /**
+     * 所属租户ID（业务id）
+     */
+    private String tenantBizId;
+
+    /**
+     * 所属项目ID（业务id）
+     */
+    private String projectBizId;
 }
 }
+
+

yd-user-feign/src/main/java/com/yd/user/feign/request/sysmenu/ApiSysMenuPageRequest.java

-package com.yd.user.feign.request.sysmenu;public class ApiSysMenuPageRequest {
+package com.yd.user.feign.request.sysmenu;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 菜单分页查询入参
+ */
+@Data
+public class ApiSysMenuPageRequest extends PageDto {
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/sysmenu/ApiSysMenuTreeListRequest.java

-package com.yd.user.feign.request.sysmenu;public class ApiSysMenuTreeListRequest {
+package com.yd.user.feign.request.sysmenu;
+
+import lombok.Data;
+
+/**
+ * 树形菜单列表查询入参
+ */
+@Data
+public class ApiSysMenuTreeListRequest {
+
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/sysproject/ApiSysProjectAddRequest.java

 package com.yd.user.feign.request.sysproject;
 package com.yd.user.feign.request.sysproject;
 
 
 import lombok.Data;
 import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 
 
 /**
 /**
  * 添加项目-入参
  * 添加项目-入参
  */
  */
 @Data
 @Data
 public class ApiSysProjectAddRequest {
 public class ApiSysProjectAddRequest {
+
+    /**
+     * 项目名称
+     */
+    @NotBlank(message = "项目名称不能为空")
+    private String projectName;
+
+    /**
+     * 项目描述
+     */
+    private String description;
+
+    /**
+     * 状态(0:禁用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 项目开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 项目结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 作用域(1:系统级（全局） 2:租户级 )
+     */
+    @NotNull(message = "作用域不能为空")
+    private Integer scope;
+
+    /**
+     * 所属租户ID（业务id）
+     */
+    private String tenantBizId;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/sysproject/ApiSysProjectEditRequest.java

@@ -2,9 +2,63 @@ package com.yd.user.feign.request.sysproject;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
 /**
 /**
  * 编辑项目-入参
  * 编辑项目-入参
  */
  */
 @Data
 @Data
 public class ApiSysProjectEditRequest {
 public class ApiSysProjectEditRequest {
+
+    /**
+     * 项目主键id
+     */
+    @NotNull(message = "项目主键id不能为空")
+    private Long id;
+
+    /**
+     * 项目唯一标识(业务ID)
+     */
+    @NotBlank(message = "项目唯一标识(业务ID)不能为空")
+    private String projectBizId;
+
+    /**
+     * 项目名称
+     */
+    @NotBlank(message = "项目名称不能为空")
+    private String projectName;
+
+    /**
+     * 项目描述
+     */
+    private String description;
+
+    /**
+     * 状态(0:禁用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 项目开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 项目结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 作用域(1:系统级（全局） 2:租户级 )
+     */
+    @NotNull(message = "作用域不能为空")
+    private Integer scope;
+
+    /**
+     * 所属租户ID（业务id）
+     */
+    private String tenantBizId;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/sysproject/ApiSysProjectPageRequest.java

 package com.yd.user.feign.request.sysproject;
 package com.yd.user.feign.request.sysproject;
 
 
+import com.yd.common.dto.PageDto;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
- * 项目分页查询-入参
+ * 项目分页查询入参
  */
  */
 @Data
 @Data
-public class ApiSysProjectPageRequest {
+public class ApiSysProjectPageRequest extends PageDto {
+
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 状态(0:禁用 1:启用)
+     */
+    private Integer status;
 }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/sysrole/ApiSysRoleAddRequest.java

@@ -2,9 +2,56 @@ package com.yd.user.feign.request.sysrole;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
 /**
  * 添加角色-入参
  * 添加角色-入参
  */
  */
 @Data
 @Data
 public class ApiSysRoleAddRequest {
 public class ApiSysRoleAddRequest {
+
+    /**
+     * 角色名称
+     */
+    @NotBlank(message = "角色名称不能为空")
+    private String roleName;
+
+    /**
+     * 角色权限字符串（用于安全认证访问控制）
+     */
+    private String roleKey;
+
+    /**
+     * 角色类型(1:超级管理员 2:管理员 3:普通用户)
+     */
+    private Integer roleType;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 作用域(1:系统级（全局） 2:租户级 3:项目级)
+     */
+    @NotNull(message = "作用域不能为空")
+    private Integer scope;
+
+    /**
+     * 所属租户ID（业务id）
+     */
+    private String tenantBizId;
+
+    /**
+     * 所属项目ID（业务id）
+     */
+    private String projectBizId;
+
 }
 }