From fa44e8b7da1dd1372bdf2cd4773a2987c1c28aed Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Tue, 7 Jan 2025 09:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=EF=BC=8C=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E6=88=90=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/RoleServiceImpl.java  | 14 ++++++++-----
 .../software/common/enums/FilePermission.java | 21 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
index 8c0b28e..50f238a 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
@@ -30,10 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.PRJ_PARENT_ID;
@@ -235,7 +232,14 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
         if (StringUtils.isNotBlank(rolePageDTO.getRoleName())) {
             queryWrapper.eq("r.role_name", rolePageDTO.getRoleName());
         }
-        return roleMapper.getPageRoleDTO(page, queryWrapper);
+        IPage<RoleDTO> result =  roleMapper.getPageRoleDTO(page, queryWrapper);
+        for (RoleDTO roleDTO : result.getRecords()) {
+            if (roleDTO.getAllowedActions() != null ) {
+                String chineseString = Arrays.stream(roleDTO.getAllowedActions().split(",")).map(FilePermission::toDescription).collect(Collectors.joining(","));
+                roleDTO.setAllowedActions(chineseString);
+            }
+        }
+        return result;
     }
 
     /**
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java
index ac132ea..d9a3c80 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java
@@ -6,14 +6,14 @@ import java.util.List;
 public enum FilePermission {
 
     // 权限枚举值
-    VIEW("view", "查看文件"),
-    MOVE("move", "移动/复制文件"),
-    EDIT("edit", "编辑文件"),
-    DELETE("delete", "删除文件"),
-    UPLOAD("upload", "上传文件"),
-    DOWNLOAD("download", "下载文件"),
-    IMPORT("import", "导入文件"),
-    EXPORT("export", "导出文件");
+    VIEW("view", "查看"),
+    MOVE("move", "移动/复制"),
+    EDIT("edit", "编辑"),
+    DELETE("delete", "删除"),
+    UPLOAD("upload", "上传"),
+    DOWNLOAD("download", "下载"),
+    IMPORT("import", "导入"),
+    EXPORT("export", "导出");
 
     // 枚举属性
     private final String code;      // 权限代码
@@ -53,5 +53,10 @@ public enum FilePermission {
     public String getDescription() {
         return description;
     }
+
+    // 转换成权限描述
+    public static String toDescription(String code) {
+        return fromCode(code).getDescription();
+    }
 }