diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java index 506602a..ecfb04a 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java @@ -58,7 +58,7 @@ public class FileController { try { fileService.remove(id); } catch (Exception e) { - log.error("删除文件失败, id-->{},原因-->{}",id, e.getMessage(), e); + log.error("删除文件失败, id-->{},原因-->{}", id, e.getMessage(), e); ElectromagneticResultUtil.fail("-1", e.getMessage()); } return ElectromagneticResultUtil.success(true); diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java index 25425d9..a1df2dc 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java @@ -5,7 +5,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.util.Map; public interface FileService { 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 ea6da71..9b5aca5 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,16 +58,6 @@ public class CommonService { @Resource private FileFormatService fileFormatService; - @PostConstruct - public void init() { - PATH_MAP.put(DataOwnEnum.SYS_FILE.code, elePropertyConfig.getSysPrjPath()); - PATH_MAP.put(DataOwnEnum.SYS_PRJ.code, elePropertyConfig.getSysPrjPath()); - PATH_MAP.put(DataOwnEnum.USER_PRJ.code, elePropertyConfig.getUserPrjPath()); - PATH_MAP.put(DataOwnEnum.USER_FILE.code, elePropertyConfig.getUserPrjPath()); - PATH_MAP.put(DataOwnEnum.REPO_FILE.code, elePropertyConfig.getRepoPrjPath()); - PATH_MAP.put(DataOwnEnum.REPO_PRJ.code, elePropertyConfig.getRepoPrjPath()); - } - private static String createTree(List edFileInfos, Object object) { TreeNodeConfig config = new TreeNodeConfig(); @@ -120,6 +110,16 @@ public class CommonService { } } + @PostConstruct + public void init() { + PATH_MAP.put(DataOwnEnum.SYS_FILE.code, elePropertyConfig.getSysPrjPath()); + PATH_MAP.put(DataOwnEnum.SYS_PRJ.code, elePropertyConfig.getSysPrjPath()); + PATH_MAP.put(DataOwnEnum.USER_PRJ.code, elePropertyConfig.getUserPrjPath()); + PATH_MAP.put(DataOwnEnum.USER_FILE.code, elePropertyConfig.getUserPrjPath()); + PATH_MAP.put(DataOwnEnum.REPO_FILE.code, elePropertyConfig.getRepoPrjPath()); + PATH_MAP.put(DataOwnEnum.REPO_PRJ.code, elePropertyConfig.getRepoPrjPath()); + } + public String getEleDataPath(int dataOwnCode) { return PATH_MAP.get(dataOwnCode); } @@ -534,10 +534,4 @@ public class CommonService { return ""; } - public String getFileCode(String path) { - int index = path.lastIndexOf("."); - return path.substring(index + 1); - - } - } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index fa41239..d9194dd 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -770,7 +770,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl FILE_PRJ_MAP = new HashMap<>(); + + static { + FILE_PRJ_MAP.put(DataOwnEnum.SYS_FILE.code, DataOwnEnum.SYS_PRJ.code); + FILE_PRJ_MAP.put(DataOwnEnum.USER_FILE.code, DataOwnEnum.USER_PRJ.code); + FILE_PRJ_MAP.put(DataOwnEnum.REPO_FILE.code, DataOwnEnum.REPO_PRJ.code); + } + public final int code; public final String desc; - public static boolean isPrjCode(int code) { return code == SYS_PRJ.code || code == USER_PRJ.code || code == REPO_PRJ.code; } @@ -27,14 +34,6 @@ public enum DataOwnEnum { return code == SYS_FILE.code || code == USER_FILE.code || code == REPO_FILE.code; } - private static final Map FILE_PRJ_MAP = new HashMap<>(); - - static { - FILE_PRJ_MAP.put(DataOwnEnum.SYS_FILE.code, DataOwnEnum.SYS_PRJ.code); - FILE_PRJ_MAP.put(DataOwnEnum.USER_FILE.code, DataOwnEnum.USER_PRJ.code); - FILE_PRJ_MAP.put(DataOwnEnum.REPO_FILE.code, DataOwnEnum.REPO_PRJ.code); - } - public static int getPrjCodeByFileCode(int fileCode) { return FILE_PRJ_MAP.get(fileCode); }