From fc56722ce580be3caecf5ab919fc6a24ebb1283b Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 7 Mar 2025 15:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/serviceimpl/CommonService.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 4f04c5b..e37a69f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -58,6 +58,14 @@ public class CommonService { @Resource private FileFormatService fileFormatService; + @PostConstruct + public void init() { + PATH_MAP.put(DataOwnEnum.SYS_FILE.code, elePropertyConfig.getPrjDir()); + PATH_MAP.put(DataOwnEnum.SYS_PRJ.code, elePropertyConfig.getPrjDir()); + PATH_MAP.put(DataOwnEnum.USER_PRJ.code, elePropertyConfig.getUserDataPath()); + PATH_MAP.put(DataOwnEnum.USER_FILE.code, elePropertyConfig.getUserDataPath()); + } + private static String createTree(List edFileInfos, Object object) { TreeNodeConfig config = new TreeNodeConfig(); @@ -114,14 +122,6 @@ public class CommonService { return PATH_MAP.get(dataOwnCode); } - @PostConstruct - public void init() { - PATH_MAP.put(DataOwnEnum.SYS_FILE.code, elePropertyConfig.getPrjDir()); - PATH_MAP.put(DataOwnEnum.SYS_PRJ.code, elePropertyConfig.getPrjDir()); - PATH_MAP.put(DataOwnEnum.USER_PRJ.code, elePropertyConfig.getUserDataPath()); - PATH_MAP.put(DataOwnEnum.USER_FILE.code, elePropertyConfig.getUserDataPath()); - } - /** * 检查同层级是否有同名的文件夹 */ @@ -492,10 +492,14 @@ public class CommonService { Set res = new HashSet<>(); - List prjInfo = (dataOwnCode == DataOwnEnum.SYS_FILE.code) ? - querySysPrjTree(PrjQuerySource.SYS_DB.value, null, new FileProjectVO()).get(PrjQuerySource.SYS_DB.value) : - queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).get(PrjQuerySource.USER_DB.value); - + List prjInfo; + if (dataOwnCode == DataOwnEnum.SYS_FILE.code) { + prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, null, new FileProjectVO()).get(PrjQuerySource.SYS_DB.value); + } else if (dataOwnCode == DataOwnEnum.USER_FILE.code) { + prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).get(PrjQuerySource.USER_DB.value); + } else { + prjInfo = queryRepoPrjTree(PrjQuerySource.REPO_DB.value, new FileProjectVO()).get(PrjQuerySource.REPO_DB.value); + } prjInfo.forEach(e -> { FileProjectVO projectVO = JSONUtil.toList(e, FileProjectVO.class).get(0); Set leafIds = getLeafNodes(projectVO).stream().map(FileProjectVO::getCategoryId).collect(Collectors.toSet());