角色

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -26,6 +26,7 @@ public class CorsConfig {
         CorsConfiguration corsConfiguration = new CorsConfiguration();
         // 允许所有来源，你可以根据需要修改为具体的来源
         corsConfiguration.addAllowedOrigin("http://192.168.5.41:9000");
+        corsConfiguration.addAllowedOrigin("http://192.168.5.30:9000");
         // 允许的方法
         corsConfiguration.addAllowedMethod("*");
         // 允许的头信息

platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -47,13 +47,13 @@ public class UserRoleController extends BaseController {
     @PostMapping("/roleList")
     public HttpResult roleList(@RequestBody SysRoleVo sysRoleVo){
         Page page = sysRoleVo.getPage();
-        Page page1 = userRoleService.page(page);
-        return HttpResult.ok(page1);
+        return HttpResult.ok(userRoleService.page(page));
     }
 
+    @Operation(summary = "角色信息查询")
     @GetMapping("/roleGet")
-    public HttpResult roleGet(@RequestBody String id){
-        return HttpResult.ok();
+    public HttpResult roleGet(String roleId){
+        return HttpResult.ok(userRoleService.roleGet(roleId));
     }
 
     @Operation(summary = "角色添加")

platform/src/main/java/com/jzg/entity/po/SysRole.java

@@ -12,7 +12,7 @@ public class SysRole extends BaseModel {
     @TableId
     private String id;
 
-    private String systemId;
+    private String systemCode;
 
     private String name;
 

platform/src/main/java/com/jzg/entity/vo/SysRoleVo.java

@@ -15,7 +15,9 @@ import lombok.NoArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Schema(description = "用户角色表VO")
 @Data
@@ -53,10 +55,32 @@ public class SysRoleVo extends PageRequest {
     public SysRole getSysRole(){
         SysRole sysRole = new SysRole();
         sysRole.setId(id);
-        sysRole.setSystemId(system);
+        sysRole.setSystemCode(system);
         sysRole.setName(name);
         sysRole.setRemark(remark);
         return sysRole;
     }
 
+    public void setSysRole(SysRole sysRole){
+        this.id = sysRole.getId();
+        this.system = sysRole.getSystemCode();
+        this.name = sysRole.getName();
+        this.remark = sysRole.getRemark();
+    }
+
+    public SysRoleVo(){}
+
+    public SysRoleVo(SysRole sysRole,List<SysRolePerms> perms){
+        this.setSysRole(sysRole);
+        if(Objects.isNull(this.perms)){
+            this.perms = new ArrayList<>();
+        }
+        perms.forEach(item->{
+            PermsVo vo = new PermsVo();
+            vo.id = item.getPermsId();
+            vo.auth = item.getPerms();
+            this.perms.add(vo);
+        });
+    }
+
 }

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -44,7 +44,12 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
 
     @Override
     public SysRoleVo roleGet(String roleId) {
-        return null;
+        SysRole sysRole = baseMapper.selectById(roleId);
+        List<SysRolePerms> sysRolePerms = sysRolePermsMapper.selectList(new LambdaQueryWrapper<SysRolePerms>()
+                .eq(SysRolePerms::getRoleId, roleId));
+        SysRoleVo sysRoleVo = new SysRoleVo(sysRole,sysRolePerms);
+
+        return sysRoleVo;
     }
 
     @Override
@@ -59,12 +64,8 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
     public boolean roleAdd(SysRoleVo sysRoleVo) {
         sysRoleVo.setId(IdGenerate.nextId());
         SysRole sysRole = sysRoleVo.getSysRole();
-        SysSystem bySystemCode = sysSystemService.getBySystemCode(sysRole.getSystemId());
-        if(Objects.isNull(bySystemCode)){
-            throw new SystemException("系统不存在,请修改");
-        }
         List<SysRolePerms> sysRolePermsList = new ArrayList<>();
-        sysRole.setSystemId(bySystemCode.getSysId());
+        sysRole.setSystemCode(sysRoleVo.getSystem());
         sysRoleVo.getPerms().forEach(item->{
             SysRolePerms perms = new SysRolePerms();
             perms.setId(IdGenerate.nextId());

platform/src/main/resources/application.yml

@@ -29,7 +29,7 @@ config:
 #多租户配置
 tenant:
   enable: true
-  column: system_id
+  column: system_code
   filterTables:
   ignoreTables:
     - sys_system

platform/src/main/resources/mapper/SysRoleMapper.xml

@@ -31,7 +31,7 @@
             srp.perms
         FROM
             sys_system ss
-                LEFT JOIN sys_role sr ON sr.system_id = ss.sys_id
+                LEFT JOIN sys_role sr ON sr.system_code = ss.sys_code
                 LEFT JOIN sys_role_perms srp ON sr.id = srp.role_id
     </select>
 </mapper>