opt

src/main/java/com/knowledge/base/application/service/UserAppService.java

@@ -45,6 +45,8 @@ public interface UserAppService {
 
     // 角色授权信息
     List<RoleFileRuleDTO> listRoleFileRules(Long roleId);
+
+    List<RoleFileRuleDTO> listAllRules();
     boolean addRoleFileRule(RoleFileRuleDTO rule);
     boolean removeRoleFileRule(Long id);
 }

src/main/java/com/knowledge/base/application/service/UserAppServiceImpl.java

@@ -146,6 +146,13 @@ public class UserAppServiceImpl implements UserAppService {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public List<RoleFileRuleDTO> listAllRules() {
+        return Optional.ofNullable(userDomainService.listAllRules()).orElse(Lists.newArrayList()).stream()
+                .map(e -> RoleFileRuleDtoConverter.toDTO(e))
+                .collect(Collectors.toList());
+    }
+
     @Override
     public boolean addRoleFileRule(RoleFileRuleDTO rule) {
         return userDomainService.addRoleFileRule(RoleFileRuleDtoConverter.toDO(rule));

src/main/java/com/knowledge/base/domain/user/model/RoleDO.java

@@ -1,11 +1,20 @@
 package com.knowledge.base.domain.user.model;
 
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
 /**
  * @author Luke.ye
  * @date 2025/6/9 10:37
  */
+@Data
 public class RoleDO {
-    public Long id;
+    private Long id;
-    public String roleCode;
+    private String roleCode;
-    public String roleName;
+    private String roleName;
+
+    private LocalDateTime addTime;
+
+    private LocalDateTime updateTime;
 }

src/main/java/com/knowledge/base/domain/user/model/RoleFileRuleDO.java

@@ -2,14 +2,18 @@ package com.knowledge.base.domain.user.model;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @author Luke.ye
  * @date 2025/6/9 10:39
  */
 @Data
 public class RoleFileRuleDO {
-    public Long id;
+    private Long id;
-    public Long roleId;
+    private Long roleId;
-    public String filePattern;
+    private String filePattern;
-    public String remark;
+    private String remark;
+    private LocalDateTime addTime;
+    private LocalDateTime updateTime;
 }

src/main/java/com/knowledge/base/domain/user/service/iface/RoleFileRuleDomainSupport.java

@@ -9,4 +9,6 @@ public interface RoleFileRuleDomainSupport {
     List<RoleFileRuleDO> findByRoleId(Long roleId);
     boolean addRoleFileRule(RoleFileRuleDO rule);
     boolean removeRoleFileRule(Long ruleId);
+
+    List<RoleFileRuleDO> listAllRules();
 }

src/main/java/com/knowledge/base/domain/user/service/iface/UserDomainService.java

@@ -33,6 +33,8 @@ public interface UserDomainService {
 
     // 角色-文件规则
     List<RoleFileRuleDO> findRoleFileRules(Long roleId);
+
+    List<RoleFileRuleDO> listAllRules();
     boolean addRoleFileRule(RoleFileRuleDO rule);
     boolean removeRoleFileRule(Long ruleId);
 

src/main/java/com/knowledge/base/domain/user/service/impl/RoleFileRuleDomainSupportImpl.java

@@ -25,6 +25,8 @@ public class RoleFileRuleDomainSupportImpl implements RoleFileRuleDomainSupport
                 .collect(Collectors.toList());
     }
 
+
+
     @Override
     public boolean addRoleFileRule(RoleFileRuleDO rule) {
         return roleFileRuleRepository.save(RoleFileRuleDomainConverter.toPO(rule));
@@ -34,4 +36,11 @@ public class RoleFileRuleDomainSupportImpl implements RoleFileRuleDomainSupport
     public boolean removeRoleFileRule(Long ruleId) {
         return roleFileRuleRepository.deleteById(ruleId);
     }
+
+    @Override
+    public List<RoleFileRuleDO> listAllRules() {
+        return Optional.ofNullable(roleFileRuleRepository.findAll()).orElse(Lists.newArrayList()).stream()
+                .map(e -> RoleFileRuleDomainConverter.toDO(e))
+                .collect(Collectors.toList());
+    }
 }

src/main/java/com/knowledge/base/domain/user/service/impl/UserDomainServiceImpl.java

@@ -109,6 +109,12 @@ public class UserDomainServiceImpl implements UserDomainService {
     public List<RoleFileRuleDO> findRoleFileRules(Long roleId) {
         return roleFileRuleDomainSupport.findByRoleId(roleId);
     }
+
+    @Override
+    public List<RoleFileRuleDO> listAllRules() {
+        return roleFileRuleDomainSupport.listAllRules();
+    }
+
     @Override
     public boolean addRoleFileRule(RoleFileRuleDO rule) {
         return roleFileRuleDomainSupport.addRoleFileRule(rule);

src/main/java/com/knowledge/base/infrastructure/config/ConstantConfig.java

@@ -1,5 +1,7 @@
 package com.knowledge.base.infrastructure.config;
 
+import java.time.format.DateTimeFormatter;
+
 /**
  * @author Luke.ye
  * @date 2025/5/19 11:18
@@ -10,4 +12,7 @@ public class ConstantConfig {
      * cookie对应的key
      */
     public static final String COOKIE_KEY = "auth_token";
+
+    public static final DateTimeFormatter DTF = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
 }

src/main/java/com/knowledge/base/infrastructure/converter/RoleDtoConverter.java

@@ -1,9 +1,12 @@
 package com.knowledge.base.infrastructure.converter;
 
 import com.knowledge.base.domain.user.model.RoleDO;
+import com.knowledge.base.infrastructure.config.ConstantConfig;
 import com.knowledge.base.infrastructure.north.dto.role.RoleDTO;
 import org.springframework.beans.BeanUtils;
 
+import java.time.ZoneId;
+
 public class RoleDtoConverter {
     public static RoleDO toDO(RoleDTO dto) {
         if (dto == null) return null;
@@ -15,6 +18,8 @@ public class RoleDtoConverter {
         if (doObj == null) return null;
         RoleDTO dto = new RoleDTO();
         BeanUtils.copyProperties(doObj, dto);
+        dto.setAddTime(doObj.getAddTime() == null ? null : doObj.getAddTime().atZone(ZoneId.of("Asia/Shanghai")).format(ConstantConfig.DTF));
+        dto.setUpdateTime(doObj.getUpdateTime() == null ? null : doObj.getUpdateTime().atZone(ZoneId.of("Asia/Shanghai")).format(ConstantConfig.DTF));
         return dto;
     }
 }

src/main/java/com/knowledge/base/infrastructure/converter/RoleFileRuleDtoConverter.java

@@ -1,9 +1,12 @@
 package com.knowledge.base.infrastructure.converter;
 
 import com.knowledge.base.domain.user.model.RoleFileRuleDO;
+import com.knowledge.base.infrastructure.config.ConstantConfig;
 import com.knowledge.base.infrastructure.north.dto.role.RoleFileRuleDTO;
 import org.springframework.beans.BeanUtils;
 
+import java.time.ZoneId;
+
 public class RoleFileRuleDtoConverter {
     public static RoleFileRuleDO toDO(RoleFileRuleDTO dto) {
         if (dto == null) return null;
@@ -15,6 +18,8 @@ public class RoleFileRuleDtoConverter {
         if (doObj == null) return null;
         RoleFileRuleDTO dto = new RoleFileRuleDTO();
         BeanUtils.copyProperties(doObj, dto);
+        dto.setAddTime(doObj.getAddTime() == null ? null : doObj.getAddTime().atZone(ZoneId.of("Asia/Shanghai")).format(ConstantConfig.DTF));
+        dto.setUpdateTime(doObj.getUpdateTime() == null ? null : doObj.getUpdateTime().atZone(ZoneId.of("Asia/Shanghai")).format(ConstantConfig.DTF));
         return dto;
     }
 }

src/main/java/com/knowledge/base/infrastructure/converter/UserDtoConverter.java

@@ -1,11 +1,11 @@
 package com.knowledge.base.infrastructure.converter;
 
 import com.knowledge.base.domain.user.model.UserDO;
+import com.knowledge.base.infrastructure.config.ConstantConfig;
 import com.knowledge.base.infrastructure.north.dto.user.UserDTO;
 import org.springframework.beans.BeanUtils;
 
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 
 
 /**
@@ -13,7 +13,6 @@ import java.time.format.DateTimeFormatter;
  * @date 2025/6/9 09:44
  */
 public class UserDtoConverter {
-    private static final DateTimeFormatter DTF = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
     public static UserDO toDO(UserDTO dto) {
         if (dto == null) return null;
         UserDO doObj = new UserDO();
@@ -24,7 +23,7 @@ public class UserDtoConverter {
         if (doObj == null) return null;
         UserDTO dto = new UserDTO();
         BeanUtils.copyProperties(doObj, dto);
-        dto.setAddTime(doObj.getAddTime() == null ? null : doObj.getAddTime().atZone(ZoneId.of("Asia/Shanghai")).format(DTF));
+        dto.setAddTime(doObj.getAddTime() == null ? null : doObj.getAddTime().atZone(ZoneId.of("Asia/Shanghai")).format(ConstantConfig.DTF));
         return dto;
     }
 }

src/main/java/com/knowledge/base/infrastructure/north/controller/RoleQueryController.java

@@ -34,4 +34,9 @@ public class RoleQueryController {
         return ResponseEntity.ok(userAppService.listRoleFileRules(roleId));
     }
 
+    @GetMapping("/list-all-rules")
+    public ResponseEntity<?> listAllRules() {
+        return ResponseEntity.ok(userAppService.listAllRules());
+    }
+
 }

src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleDTO.java

@@ -8,7 +8,9 @@ import lombok.Data;
  */
 @Data
 public class RoleDTO {
-    public Long id;
+    private Long id;
-    public String roleCode;
+    private String roleCode;
-    public String roleName;
+    private String roleName;
+    private String addTime;
+    private String updateTime;
 }

src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleFileRuleDTO.java

@@ -8,8 +8,10 @@ import lombok.Data;
  */
 @Data
 public class RoleFileRuleDTO {
-    public Long id;
+    private Long id;
-    public Long roleId;
+    private Long roleId;
-    public String filePattern;
+    private String filePattern;
-    public String remark;
+    private String remark;
+    private String addTime;
+    private String updateTime;
 }