chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决遇到的bug

This commit is contained in:
chenxudong 2025-05-12 10:13:34 +08:00
parent 63de8f4d60
commit b0c6633d87
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -844,7 +844,7 @@ public class CommonService {
} }
} }
} }
UserThreadLocal.setSuccessInfo("", targetId, "层级沿用成功"); UserThreadLocal.setSuccessInfo("", targetId, "层级沿用成功，源工程id {}，目标工程id {}，", sourceId, targetId);
return ElectromagneticResultUtil.success(true); return ElectromagneticResultUtil.success(true);
} catch (Exception e) { } catch (Exception e) {
String info = StrFormatter.format("层级沿用失败，源工程 {}，目标工程 {}，原因 {}", sourceId, targetId, e.getMessage()); String info = StrFormatter.format("层级沿用失败，源工程 {}，目标工程 {}，原因 {}", sourceId, targetId, e.getMessage());
@ -877,7 +877,7 @@ public class CommonService {
.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code) .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
.likeRight(EdFileInfo::getFilePath, prjId); .likeRight(EdFileInfo::getFilePath, prjId);
edFileInfoMapper.update(new EdFileInfo(), updateWrapper); edFileInfoMapper.update(new EdFileInfo(), updateWrapper);
UserThreadLocal.setSuccessInfo("", prjId, "项目 {} 发布成功", fileInfo.getFileName()); UserThreadLocal.setSuccessInfo("", prjId, "项目 {} 发布成功， 项目id {}", fileInfo.getFileName(), prjId);
return ElectromagneticResultUtil.success(true); return ElectromagneticResultUtil.success(true);
} catch (Exception e) { } catch (Exception e) {
String info = StrFormatter.format("项目 {} 发布异常", fileInfo.getFileName()); String info = StrFormatter.format("项目 {} 发布异常", fileInfo.getFileName());

7
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -1571,7 +1571,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
String orgName = file.getOriginalFilename(); String orgName = file.getOriginalFilename();
String tmpZipFile = elePropertyConfig.getEleTmpPath() + File.separator + orgName; String tmpZipFile = elePropertyConfig.getEleTmpPath() + File.separator + orgName;
String mainName = FileUtil.mainName(orgName); String mainName = FileUtil.mainName(orgName);
String suffix = FileUtil.getSuffix(orgName);
FileUtil.del(tmpZipFile); FileUtil.del(tmpZipFile);
FileUtil.writeFromStream(file.getInputStream(), tmpZipFile); FileUtil.writeFromStream(file.getInputStream(), tmpZipFile);
String destDir = elePropertyConfig.getEleTmpPath() + File.separator + IdUtil.fastSimpleUUID(); String destDir = elePropertyConfig.getEleTmpPath() + File.separator + IdUtil.fastSimpleUUID();
@ -1606,9 +1605,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
for (File importFile : files) { for (File importFile : files) {
String parentDir = FileUtil.normalize(importFile.getParent()); String parentDir = FileUtil.normalize(importFile.getParent());
String relativeFilePath = parentDir.replace(tmpPath, ""); String relativeFilePath = parentDir.replace(tmpPath, "");
while (relativeFilePath.startsWith(File.separator)) {
relativeFilePath = relativeFilePath.substring(1);
}
String fileType = FileUtil.getSuffix(importFile.getName()); String fileType = FileUtil.getSuffix(importFile.getName());
relativeFilePath = relativeFilePath.startsWith("/") ? relativeFilePath.substring(1) : relativeFilePath; relativeFilePath = relativeFilePath.startsWith("/") ? relativeFilePath.substring(1) : relativeFilePath;
relativeFilePath = relativeFilePath.replace("/", MYSQL_FILE_PATH_SPLIT); relativeFilePath = relativeFilePath.replace("/", MYSQL_FILE_PATH_SPLIT);
@ -1621,7 +1617,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.setFileCode(fileCode) .setFileCode(fileCode)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setDataOwn(DataOwnEnum.SYS_FILE.code) .setDataOwn(DataOwnEnum.SYS_FILE.code)
.setFileName(importFile.getName()) .setFileName(FileUtil.mainName(importFile))
.setFileContent(EleCommonUtil.parse(FileUtil.getInputStream(importFile), fileType)) .setFileContent(EleCommonUtil.parse(FileUtil.getInputStream(importFile), fileType))
.setFileType(fileType) .setFileType(fileType)
.setFileVersion(FILE_START_VERSION) .setFileVersion(FILE_START_VERSION)
@ -1634,6 +1630,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
String destPath = commonService.getPrjRootPath1(DataOwnEnum.SYS_FILE.code) + File.separator + newEdFileInfo.getId(); String destPath = commonService.getPrjRootPath1(DataOwnEnum.SYS_FILE.code) + File.separator + newEdFileInfo.getId();
FileUtil.move(importFile, new File(destPath), false); FileUtil.move(importFile, new File(destPath), false);
EleCommonUtil.encryptFile(destPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes())); EleCommonUtil.encryptFile(destPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
UserThreadLocal.setSuccessInfo(newEdFileInfo.getParentId(), newEdFileInfo.getId(), "解析导入的工程文件成功，导入的工程名为 {}，文件名为 {}", orgName, importFile.getName());
} }
} }