diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a77d95e..5fb2a62 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,9 +6,11 @@ - - - + + + + + - + + + + + + + + @@ -87,7 +115,9 @@ 1754560710248 - + + + - @@ -127,9 +165,14 @@ - file://$PROJECT_DIR$/src/main/java/com/hivekion/common/filter/JwtAuthenticationFilter.java - 83 - + + file://$PROJECT_DIR$/src/main/java/com/hivekion/system/controller/UserLoginController.java + 103 + diff --git a/src/main/java/com/hivekion/CodeGenerator.java b/src/main/java/com/hivekion/CodeGenerator.java index db20c2e..38807a8 100644 --- a/src/main/java/com/hivekion/CodeGenerator.java +++ b/src/main/java/com/hivekion/CodeGenerator.java @@ -28,12 +28,12 @@ public class CodeGenerator { }) .packageConfig(builder -> { builder.parent("com.hivekion") // 设置父包名 - .moduleName("scenario") // 设置模块名（可选） + .moduleName("environment") // 设置模块名（可选） .pathInfo(Collections.singletonMap(OutputFile.xml, basePath + "/src/main/resources/mapper/tbl")); // 设置mapperXml生成路径 }) .strategyConfig(builder -> { - builder.addInclude("tbl_scenario_history") // 设置需要生成的表名（多个用逗号分隔） + builder.addInclude("tbl_ebe") // 设置需要生成的表名（多个用逗号分隔） .addTablePrefix("tbl_"); // 设置过滤表前缀 }) .execute(); diff --git a/src/main/java/com/hivekion/baseData/controller/TreeController.java b/src/main/java/com/hivekion/baseData/controller/TreeController.java index 6abf49b..95914b8 100644 --- a/src/main/java/com/hivekion/baseData/controller/TreeController.java +++ b/src/main/java/com/hivekion/baseData/controller/TreeController.java @@ -21,13 +21,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * 系统中的树接口 - * - * @author LiDongYU - * @since 2025/7/22 - */ - @RestController @RequestMapping("/tree") @Api(value = "", tags = {"树数据-系统中各类树接口"}) @@ -38,12 +31,6 @@ public class TreeController { @Resource private FightpowerhierarchyService fightpowerhierarchyService; - /** - * 获取指定id的树；如果ID为空，返回所有 - * - * @param id 指定ID - * @return 列表或者对象 - */ @GetMapping("/armament") @ApiOperation(value = "装备树", notes = "") public ResponseData> armamentTree( @@ -65,7 +52,6 @@ public class TreeController { return ResponseData.success(nodeList); } - @GetMapping("/organization") @ApiOperation(value = "组织机构树", notes = "") public ResponseData> organizedTree(Integer id) { @@ -79,22 +65,18 @@ public class TreeController { /** * 增加树节点到list - * @param nodeList 节点列表 - * @param id 对象ID - * @param list 对象列表 - * @param 泛型对象 */ private void addTreeNodeToList(List nodeList, Integer id, List list) { - //映射 key-value - Map tblEntityMap = idMap(list); - //id=父ID - Map> parentMap = parentIdMap(list); + Map entityMap = idMap(list); + Map> parentMap = parentIdMap(list); if (id != null) { - TreeEntity entity = tblEntityMap.get(id); - buildOneEntity(nodeList, entity, parentMap); + T entity = entityMap.get(id); + if (entity != null) { + buildOneEntity(nodeList, entity, parentMap); + } } else { parentMap.forEach((key, value) -> { - if (key <= 0) { + if (key == null || key <= 0) { value.forEach(t -> buildOneEntity(nodeList, t, parentMap)); } }); @@ -103,12 +85,9 @@ public class TreeController { /** * 建立一个节点的树形数据 - * @param nodeList 节点列表 - * @param entity 对象 - * @param parentMap key=parentId,value为对象list */ - private void buildOneEntity(List nodeList, TreeEntity entity, - Map> parentMap) { + private void buildOneEntity(List nodeList, T entity, + Map> parentMap) { TreeNode node = new TreeNode(String.valueOf(entity.getId()), entity.getTitleName(), String.valueOf(entity.getId())); nodeList.add(node); @@ -116,13 +95,12 @@ public class TreeController { buildRecursionArmamentTree(node, parentMap); } - - private void buildRecursionArmamentTree(TreeNode info, Map> parentMap) { - - if (parentMap.containsKey(Integer.parseInt(info.getKey()))) { + private void buildRecursionArmamentTree(TreeNode info, Map> parentMap) { + Integer key = Integer.parseInt(info.getKey()); + if (parentMap.containsKey(key)) { List children = new ArrayList<>(); info.setChildren(children); - parentMap.get(Integer.parseInt(info.getKey())).forEach(a -> { + parentMap.get(key).forEach(a -> { TreeNode innerNode = new TreeNode(String.valueOf(a.getId()), a.getTitleName(), String.valueOf(a.getId())); children.add(innerNode); @@ -131,11 +109,11 @@ public class TreeController { } } - private Map idMap(List list) { + private Map idMap(List list) { return list.stream().collect(Collectors.toMap(TreeEntity::getId, a -> a)); } - private Map> parentIdMap(List list) { + private Map> parentIdMap(List list) { return list.stream().collect(Collectors.groupingBy(a -> { if (a.getParentId() == null) { a.setParentId(0); @@ -143,6 +121,4 @@ public class TreeController { return a.getParentId(); }, LinkedHashMap::new, Collectors.toList())); } - - -} +} \ No newline at end of file diff --git a/src/main/java/com/hivekion/common/entity/vo/LoginUser.java b/src/main/java/com/hivekion/common/entity/vo/LoginUser.java index 1c3a610..859bcda 100644 --- a/src/main/java/com/hivekion/common/entity/vo/LoginUser.java +++ b/src/main/java/com/hivekion/common/entity/vo/LoginUser.java @@ -29,7 +29,7 @@ public class LoginUser implements UserDetails { return this.passWord; } - @JsonIgnore + @Override public String getUsername() { return this.userName; @@ -40,7 +40,7 @@ public class LoginUser implements UserDetails { * * @return */ - @JsonIgnore + @Override public boolean isAccountNonExpired() { return true; @@ -51,7 +51,7 @@ public class LoginUser implements UserDetails { * * @return */ - @JsonIgnore + @Override public boolean isAccountNonLocked() { return true; diff --git a/src/main/java/com/hivekion/common/services/CustomUserDetailServiceImpl.java b/src/main/java/com/hivekion/common/services/CustomUserDetailServiceImpl.java index 8a3e6bb..2bcd9c4 100644 --- a/src/main/java/com/hivekion/common/services/CustomUserDetailServiceImpl.java +++ b/src/main/java/com/hivekion/common/services/CustomUserDetailServiceImpl.java @@ -40,6 +40,7 @@ public class CustomUserDetailServiceImpl implements UserDetailsService { LoginUser user = new LoginUser(); BeanUtils.copyProperties(sysUser, user); user.setEnabled(sysUser.getStatus().equals(0)); + user.setUserName(username); user.setUserId(sysUser.getId()); if (user.getUsername().equals("admin")) { List permissions = diff --git a/src/main/java/com/hivekion/system/controller/UserLoginController.java b/src/main/java/com/hivekion/system/controller/UserLoginController.java index 4ae7d23..429c0c2 100644 --- a/src/main/java/com/hivekion/system/controller/UserLoginController.java +++ b/src/main/java/com/hivekion/system/controller/UserLoginController.java @@ -206,6 +206,7 @@ public class UserLoginController { public List UserMenu() { LoginUser currentUser = SecurityUtils.getCurrentLoginUser(); List permissions = new ArrayList<>(); + if (currentUser.getUsername().equals("admin")) { permissions = menuService.getMenuList().stream().map(x -> x.getId()).collect(Collectors.toList()); } else {