From a89cca59092d805d6c793ca4cf6216df7db4a24d Mon Sep 17 00:00:00 2001 From: luke Date: Wed, 11 Jun 2025 15:32:17 +0800 Subject: [PATCH] opt --- .../base/application/service/UserAppService.java | 2 ++ .../application/service/UserAppServiceImpl.java | 7 +++++++ .../knowledge/base/domain/user/model/RoleDO.java | 15 ++++++++++++--- .../base/domain/user/model/RoleFileRuleDO.java | 12 ++++++++---- .../service/iface/RoleFileRuleDomainSupport.java | 2 ++ .../user/service/iface/UserDomainService.java | 2 ++ .../impl/RoleFileRuleDomainSupportImpl.java | 9 +++++++++ .../user/service/impl/UserDomainServiceImpl.java | 6 ++++++ .../infrastructure/config/ConstantConfig.java | 5 +++++ .../converter/RoleDtoConverter.java | 5 +++++ .../converter/RoleFileRuleDtoConverter.java | 5 +++++ .../converter/UserDtoConverter.java | 5 ++--- .../north/controller/RoleQueryController.java | 5 +++++ .../infrastructure/north/dto/role/RoleDTO.java | 8 +++++--- .../north/dto/role/RoleFileRuleDTO.java | 10 ++++++---- 15 files changed, 81 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/knowledge/base/application/service/UserAppService.java b/src/main/java/com/knowledge/base/application/service/UserAppService.java index 2b90f7e..2c21087 100644 --- a/src/main/java/com/knowledge/base/application/service/UserAppService.java +++ b/src/main/java/com/knowledge/base/application/service/UserAppService.java @@ -45,6 +45,8 @@ public interface UserAppService { // 角色授权信息 List listRoleFileRules(Long roleId); + + List listAllRules(); boolean addRoleFileRule(RoleFileRuleDTO rule); boolean removeRoleFileRule(Long id); } diff --git a/src/main/java/com/knowledge/base/application/service/UserAppServiceImpl.java b/src/main/java/com/knowledge/base/application/service/UserAppServiceImpl.java index 639ea20..2344c66 100644 --- a/src/main/java/com/knowledge/base/application/service/UserAppServiceImpl.java +++ b/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 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)); diff --git a/src/main/java/com/knowledge/base/domain/user/model/RoleDO.java b/src/main/java/com/knowledge/base/domain/user/model/RoleDO.java index 3c546b1..4d3cfe9 100644 --- a/src/main/java/com/knowledge/base/domain/user/model/RoleDO.java +++ b/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; - public String roleCode; - public String roleName; + private Long id; + private String roleCode; + private String roleName; + + private LocalDateTime addTime; + + private LocalDateTime updateTime; } diff --git a/src/main/java/com/knowledge/base/domain/user/model/RoleFileRuleDO.java b/src/main/java/com/knowledge/base/domain/user/model/RoleFileRuleDO.java index 0d622fb..afd8616 100644 --- a/src/main/java/com/knowledge/base/domain/user/model/RoleFileRuleDO.java +++ b/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; - public Long roleId; - public String filePattern; - public String remark; + private Long id; + private Long roleId; + private String filePattern; + private String remark; + private LocalDateTime addTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/knowledge/base/domain/user/service/iface/RoleFileRuleDomainSupport.java b/src/main/java/com/knowledge/base/domain/user/service/iface/RoleFileRuleDomainSupport.java index cc2ada0..e42d4be 100644 --- a/src/main/java/com/knowledge/base/domain/user/service/iface/RoleFileRuleDomainSupport.java +++ b/src/main/java/com/knowledge/base/domain/user/service/iface/RoleFileRuleDomainSupport.java @@ -9,4 +9,6 @@ public interface RoleFileRuleDomainSupport { List findByRoleId(Long roleId); boolean addRoleFileRule(RoleFileRuleDO rule); boolean removeRoleFileRule(Long ruleId); + + List listAllRules(); } diff --git a/src/main/java/com/knowledge/base/domain/user/service/iface/UserDomainService.java b/src/main/java/com/knowledge/base/domain/user/service/iface/UserDomainService.java index 28fa1f9..5739b98 100644 --- a/src/main/java/com/knowledge/base/domain/user/service/iface/UserDomainService.java +++ b/src/main/java/com/knowledge/base/domain/user/service/iface/UserDomainService.java @@ -33,6 +33,8 @@ public interface UserDomainService { // 角色-文件规则 List findRoleFileRules(Long roleId); + + List listAllRules(); boolean addRoleFileRule(RoleFileRuleDO rule); boolean removeRoleFileRule(Long ruleId); diff --git a/src/main/java/com/knowledge/base/domain/user/service/impl/RoleFileRuleDomainSupportImpl.java b/src/main/java/com/knowledge/base/domain/user/service/impl/RoleFileRuleDomainSupportImpl.java index 1d12058..c4208b6 100644 --- a/src/main/java/com/knowledge/base/domain/user/service/impl/RoleFileRuleDomainSupportImpl.java +++ b/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 listAllRules() { + return Optional.ofNullable(roleFileRuleRepository.findAll()).orElse(Lists.newArrayList()).stream() + .map(e -> RoleFileRuleDomainConverter.toDO(e)) + .collect(Collectors.toList()); + } } diff --git a/src/main/java/com/knowledge/base/domain/user/service/impl/UserDomainServiceImpl.java b/src/main/java/com/knowledge/base/domain/user/service/impl/UserDomainServiceImpl.java index 2c7ac15..f2664b6 100644 --- a/src/main/java/com/knowledge/base/domain/user/service/impl/UserDomainServiceImpl.java +++ b/src/main/java/com/knowledge/base/domain/user/service/impl/UserDomainServiceImpl.java @@ -109,6 +109,12 @@ public class UserDomainServiceImpl implements UserDomainService { public List findRoleFileRules(Long roleId) { return roleFileRuleDomainSupport.findByRoleId(roleId); } + + @Override + public List listAllRules() { + return roleFileRuleDomainSupport.listAllRules(); + } + @Override public boolean addRoleFileRule(RoleFileRuleDO rule) { return roleFileRuleDomainSupport.addRoleFileRule(rule); diff --git a/src/main/java/com/knowledge/base/infrastructure/config/ConstantConfig.java b/src/main/java/com/knowledge/base/infrastructure/config/ConstantConfig.java index 2e49184..63f7089 100644 --- a/src/main/java/com/knowledge/base/infrastructure/config/ConstantConfig.java +++ b/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"); + } diff --git a/src/main/java/com/knowledge/base/infrastructure/converter/RoleDtoConverter.java b/src/main/java/com/knowledge/base/infrastructure/converter/RoleDtoConverter.java index f0931cb..75d73e9 100644 --- a/src/main/java/com/knowledge/base/infrastructure/converter/RoleDtoConverter.java +++ b/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; } } diff --git a/src/main/java/com/knowledge/base/infrastructure/converter/RoleFileRuleDtoConverter.java b/src/main/java/com/knowledge/base/infrastructure/converter/RoleFileRuleDtoConverter.java index f036935..035bfba 100644 --- a/src/main/java/com/knowledge/base/infrastructure/converter/RoleFileRuleDtoConverter.java +++ b/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; } } diff --git a/src/main/java/com/knowledge/base/infrastructure/converter/UserDtoConverter.java b/src/main/java/com/knowledge/base/infrastructure/converter/UserDtoConverter.java index 77e2e14..f1a0274 100644 --- a/src/main/java/com/knowledge/base/infrastructure/converter/UserDtoConverter.java +++ b/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; } } diff --git a/src/main/java/com/knowledge/base/infrastructure/north/controller/RoleQueryController.java b/src/main/java/com/knowledge/base/infrastructure/north/controller/RoleQueryController.java index d16865e..3c2bb73 100644 --- a/src/main/java/com/knowledge/base/infrastructure/north/controller/RoleQueryController.java +++ b/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()); + } + } diff --git a/src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleDTO.java b/src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleDTO.java index 18f5271..f3ce7a1 100644 --- a/src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleDTO.java +++ b/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; - public String roleCode; - public String roleName; + private Long id; + private String roleCode; + private String roleName; + private String addTime; + private String updateTime; } diff --git a/src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleFileRuleDTO.java b/src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleFileRuleDTO.java index 01dc4a0..58509bd 100644 --- a/src/main/java/com/knowledge/base/infrastructure/north/dto/role/RoleFileRuleDTO.java +++ b/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; - public Long roleId; - public String filePattern; - public String remark; + private Long id; + private Long roleId; + private String filePattern; + private String remark; + private String addTime; + private String updateTime; }