From 8f5486df6747ff418c9b95bafce06d59a656ed14 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 5 Mar 2025 16:12:35 +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

---
 .../manage/service/serviceimpl/CommonService.java    | 12 +++++++-----
 .../service/serviceimpl/FileFormatServiceImpl.java   |  1 -
 2 files changed, 7 insertions(+), 6 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 5900992..e82c130 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
@@ -42,7 +42,6 @@ public class CommonService {
 
     private static final Map<Integer, String> PATH_MAP = new HashMap<>();
 
-
     private final EleLog log = new EleLog(CommonService.class);
     @Value("${prj.folder.max.length}")
     private int prjFolderMaxLength;
@@ -122,6 +121,9 @@ public class CommonService {
     }
 
     public String createFileCode(String parentId, String fileType, int version, String timeStr) {
+        if (fileType.equals(EleDataTypeEnum.FOLDER.desc)) {
+            return parentId + "00" + version + timeStr;
+        }
         FileFormat fileFormat = fileFormatService.getBaseMapper().selectOne(Wrappers.lambdaQuery(FileFormat.class).eq(FileFormat::getSuffixName, fileType));
         Assert.notNull(fileFormat, "不支持当前格式 {}", fileType);
         return parentId + fileFormat.getSuffixNo() + version + timeStr;
@@ -183,7 +185,7 @@ public class CommonService {
                     .setFileCode(createFileCode(parentId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr))
                     .setFileTime(nowTimeStr)
                     .setDataType(EleDataTypeEnum.FOLDER.code)
-                    .setDataStatus(dataOwnCode == 1 || dataOwnCode == 2 ? EleDataStatusEnum.NOT_PUBLISHED.code : EleDataStatusEnum.PUBLISHED.code)
+                    .setDataStatus(DataOwnEnum.isPrjCode(dataOwnCode) ? EleDataStatusEnum.NOT_PUBLISHED.code : EleDataStatusEnum.PUBLISHED.code)
                     .setEffectFlag(EffectFlagEnum.EFFECT.code)
                     .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                     .setFilePath(path)
@@ -217,7 +219,7 @@ public class CommonService {
                 queryWrapper.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId());
             }
 
-            if (dataOwnCode == DataOwnEnum.SYS_PRJ.code || dataOwnCode == DataOwnEnum.USER_PRJ.code) {
+            if (DataOwnEnum.isPrjCode(dataOwnCode)) {
                 queryWrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code).in(EdFileInfo::getId, prjIds);
             }
             List<String> ids = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
@@ -225,7 +227,7 @@ public class CommonService {
 
             for (String id : ids) {
                 List<EdFileInfo> edFileInfos = selectAllAdminFolder(id, prjIds, dataOwnCode);
-                if (dataOwnCode == DataOwnEnum.USER_PRJ.code || dataOwnCode == DataOwnEnum.SYS_PRJ.code) {
+                if (DataOwnEnum.isPrjCode(dataOwnCode)) {
                     edFileInfos = edFileInfos.stream().filter(e -> e.getDataStatus().equals(EleDataStatusEnum.PUBLISHED.code)
                             || e.getDataStatus().equals(EleDataStatusEnum.DELETED.code))
                             .collect(Collectors.toList());
@@ -233,7 +235,7 @@ public class CommonService {
                     edFileInfos = edFileInfos.stream().filter(e -> !e.getDataStatus().equals(EleDataStatusEnum.DELETED.code)).collect(Collectors.toList());
                 }
                 // 转换为树
-                if (dataOwnCode == DataOwnEnum.USER_PRJ.code || dataOwnCode == DataOwnEnum.SYS_PRJ.code) {
+                if (DataOwnEnum.isPrjCode(dataOwnCode)) {
                     TreeNodeConfig config = new TreeNodeConfig();
                     config.setIdKey(EdFileInfo.Fields.id);
                     config.setParentIdKey(EdFileInfo.Fields.parentId);
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java
index a07a4b0..4e943a5 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java
@@ -13,7 +13,6 @@ import com.electromagnetic.industry.software.manage.pojo.models.FileFormat;
 import com.electromagnetic.industry.software.manage.pojo.resp.FileFormatVO;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;