QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/20240913' into 20240913

Browse Source
This commit is contained in:
梁琦涛
2024-09-11 18:02:50 +08:00
parent b012059160 d163df17ef
commit 35e429e65b
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+24 -23
View File
@@ -1987,11 +1987,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
HashMap<String, String> menuAndItemMap = new HashMap<>();
List<SarFileSplitMenuTreeNode> treeList = new ArrayList<>();
List<Map<String, Object>> itemsEOList = new ArrayList<>(addItemsEOList);
if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){
treeList = buildTree2(itemsEOList, treeListDisplay, menuId);
}else {
//if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){
// treeList = buildTree2(itemsEOList, treeListDisplay, menuId);
//}else {
treeList = buildTree(itemsEOList, treeListDisplay, menuId);
}
//}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
for (SarFileSplitMenuTreeNode treeNode : treeList) {
@@ -3540,25 +3540,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode();
treeNode.setId(UUIDUtils.randomUUID20());
treeNode.setName(itemNum);
if(itemNum.matches(regex)) {
//父级是 总目录时，不做处理
if(itemNum.contains(".")) {
String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
treeNode.setParentName(parentName);
List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(p)) {
//其他节点
treeNode.setParentId(p.get(0).getId());
}else{
//一级节点
treeNode.setParentId(menuId);
}
}else{
treeNode.setParentId(menuId);
}
}
else if (StringUtils.isBlank(itemTitle)){
//if(itemNum.matches(regex)) {
// //父级是 总目录时，不做处理
// if(itemNum.contains(".")) {
// String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
// treeNode.setParentName(parentName);
//
// List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
// if (CollectionUtil.isNotEmpty(p)) {
// //其他节点
// treeNode.setParentId(p.get(0).getId());
// }else{
// //一级节点
// treeNode.setParentId(menuId);
// }
// }else{
// treeNode.setParentId(menuId);
// }
//}
//else
if (StringUtils.isBlank(itemTitle)){
treeNode.setParentId(parentId);
}
else{
laws-single-startup/src/main/resources/application-dev.yml
+1 -1
View File
@@ -147,7 +147,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
datasource:
master:
url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev_init?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: hzwlsoft.com
driver-class-name: com.p6spy.engine.spy.P6SpyDriver