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

编译通过

This commit is contained in:
chenxudong 2025-04-15 14:36:56 +08:00
parent 98e7023c5c
commit 70111a98fe
6 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java
View File

@ -14,6 +14,4 @@ public class FileFormat extends BaseModel {
private String suffixNo; private String suffixNo;
private String suffixName; private String suffixName;
private Integer effectFlag;
} }

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

@ -250,12 +250,12 @@ public class CommonService {
.setFileTime(nowTimeStr) .setFileTime(nowTimeStr)
.setDataType(EleDataTypeEnum.FOLDER.code) .setDataType(EleDataTypeEnum.FOLDER.code)
.setDataStatus(DataOwnEnum.isPrjCode(dataOwnCode) ? 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) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setFilePath(path) .setFilePath(path)
.setSort(names.size() + 1) .setSort(names.size() + 1)
.setFileNote(fileNote) .setFileNote(fileNote)
.setDataOwn(dataOwnCode); .setDataOwn(dataOwnCode)
.setEffectFlag(EffectFlagEnum.EFFECT.code);
edFileInfoMapper.insert(fileInfo); edFileInfoMapper.insert(fileInfo);
// 保存到文件系统 // 保存到文件系统
String targetFilePath; String targetFilePath;

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

@ -1037,6 +1037,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
String fileCode = commonService.createFileCode(codePathByDbPath, suffix, FILE_START_VERSION, newEdFileInfo.getFileTime()); String fileCode = commonService.createFileCode(codePathByDbPath, suffix, FILE_START_VERSION, newEdFileInfo.getFileTime());
newEdFileInfo.setParentId(parentId) newEdFileInfo.setParentId(parentId)
.setFileCode(fileCode) .setFileCode(fileCode)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setDataOwn(dataOwnCode)
.setFileName(mainName) .setFileName(mainName)
.setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix)) .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix))
.setFileType(suffix) .setFileType(suffix)
@ -1045,10 +1047,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.setFilePath(parentFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId()) .setFilePath(parentFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())
.setDataType(EleDataTypeEnum.FILE.code) .setDataType(EleDataTypeEnum.FILE.code)
.setDataStatus(PublishEnum.PUBLISHED.getCode()) .setDataStatus(PublishEnum.PUBLISHED.getCode())
.setEffectFlag(EffectFlagEnum.EFFECT.code) .setEffectFlag(EffectFlagEnum.EFFECT.code);
.setFileCode(fileCode)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setDataOwn(dataOwnCode);
this.saveOrUpdate(newEdFileInfo); this.saveOrUpdate(newEdFileInfo);
String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode); String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
FileUtil.writeFromStream(file.getInputStream(), fileDestPath); FileUtil.writeFromStream(file.getInputStream(), fileDestPath);
@ -1060,15 +1059,15 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
String info = StrFormatter.format("文件 {} 为上传到 {} 失败，原因 {}，同名同后缀的处理方式为 {}", fileName, destPath, e.getMessage(), strategyStr); String info = StrFormatter.format("文件 {} 为上传到 {} 失败，原因 {}，同名同后缀的处理方式为 {}", fileName, destPath, e.getMessage(), strategyStr);
newEdFileInfo.setParentId(parentId) newEdFileInfo.setParentId(parentId)
.setFileName(mainName) .setFileName(mainName)
.setSaveStatus(EleDataSaveStatusEnum.FAIL.code)
.setFileType(suffix) .setFileType(suffix)
.setFileVersion(0)
.setFileCode("")
.setDataOwn(dataOwnCode)
.setFileSize(file.getSize()) .setFileSize(file.getSize())
.setDataType(EleDataTypeEnum.FILE.code) .setDataType(EleDataTypeEnum.FILE.code)
.setDataStatus(PublishEnum.PUBLISHED.getCode()) .setDataStatus(PublishEnum.PUBLISHED.getCode())
.setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code) .setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code);
.setSaveStatus(EleDataSaveStatusEnum.FAIL.code)
.setFileVersion(0)
.setFileCode("")
.setDataOwn(dataOwnCode);
this.saveOrUpdate(newEdFileInfo); this.saveOrUpdate(newEdFileInfo);
log.error(info, e); log.error(info, e);
throw new BizException(info); throw new BizException(info);
@ -1177,8 +1176,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFileDbId) .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFileDbId)
.setPreVersion(maxFileVersion) .setPreVersion(maxFileVersion)
.setDataOwn(dataOwnCode) .setDataOwn(dataOwnCode)
.setEffectFlag(EffectFlagEnum.EFFECT.code) .setFileCode(fileCode)
.setFileCode(fileCode); .setEffectFlag(EffectFlagEnum.EFFECT.code);
this.baseMapper.insert(destSaveFileInfo); this.baseMapper.insert(destSaveFileInfo);
String srcFilePath = commonService.getFileSysPath(srcFileInfo.getFilePath(), dataOwnCode); String srcFilePath = commonService.getFileSysPath(srcFileInfo.getFilePath(), dataOwnCode);
String destFilePath = commonService.getFileSysPath(destSaveFileInfo.getFilePath(), dataOwnCode); String destFilePath = commonService.getFileSysPath(destSaveFileInfo.getFilePath(), dataOwnCode);
@ -1353,8 +1352,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
destSaveFileInfo.setFileVersion(maxFileVersion + 1) destSaveFileInfo.setFileVersion(maxFileVersion + 1)
.setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFileDbId) .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFileDbId)
.setPreVersion(maxFileVersion) .setPreVersion(maxFileVersion)
.setEffectFlag(EffectFlagEnum.EFFECT.code) .setFileCode(fileCode)
.setFileCode(fileCode); .setEffectFlag(EffectFlagEnum.EFFECT.code);
this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class).eq(EdFileInfo::getParentId, targetFolderId) this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class).eq(EdFileInfo::getParentId, targetFolderId)
.eq(EdFileInfo::getFileName, srcFileInfo.getFileName()) .eq(EdFileInfo::getFileName, srcFileInfo.getFileName())
.eq(EdFileInfo::getFileType, srcFileInfo.getFileType()).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)); .eq(EdFileInfo::getFileType, srcFileInfo.getFileType()).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
@ -1425,10 +1424,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId()) .setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())
.setDataType(EleDataTypeEnum.FILE.code) .setDataType(EleDataTypeEnum.FILE.code)
.setDataStatus(PublishEnum.PUBLISHED.getCode()) .setDataStatus(PublishEnum.PUBLISHED.getCode())
.setEffectFlag(EffectFlagEnum.EFFECT.code)
.setFileCode(fileCode) .setFileCode(fileCode)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setDataOwn(dataOwnCode); .setDataOwn(dataOwnCode)
.setEffectFlag(EffectFlagEnum.EFFECT.code);
this.baseMapper.insert(newEdFileInfo); this.baseMapper.insert(newEdFileInfo);
String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode); String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
fileSystemService.save(file.getInputStream(), fileDestPath); fileSystemService.save(file.getInputStream(), fileDestPath);
@ -1454,10 +1453,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId()) .setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())
.setDataType(EleDataTypeEnum.FILE.code) .setDataType(EleDataTypeEnum.FILE.code)
.setDataStatus(PublishEnum.PUBLISHED.getCode()) .setDataStatus(PublishEnum.PUBLISHED.getCode())
.setEffectFlag(EffectFlagEnum.EFFECT.code)
.setFileCode(fileCode) .setFileCode(fileCode)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setDataOwn(dataOwnCode); .setDataOwn(dataOwnCode)
.setEffectFlag(EffectFlagEnum.EFFECT.code);
resetFileInfoName(newEdFileInfo); resetFileInfoName(newEdFileInfo);
this.baseMapper.insert(newEdFileInfo); this.baseMapper.insert(newEdFileInfo);
String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode); String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);

8
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
View File

@ -243,10 +243,10 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
.setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId()) .setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())
.setDataType(EleDataTypeEnum.FILE.code) .setDataType(EleDataTypeEnum.FILE.code)
.setDataStatus(PublishEnum.PUBLISHED.getCode()) .setDataStatus(PublishEnum.PUBLISHED.getCode())
.setEffectFlag(EffectFlagEnum.EFFECT.code)
.setFileCode(fileCode) .setFileCode(fileCode)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setDataOwn(dataOwnCode); .setDataOwn(dataOwnCode)
.setEffectFlag(EffectFlagEnum.EFFECT.code);
// 文件名加”_1“，存为新文件 // 文件名加”_1“，存为新文件
if (count > 0) { if (count > 0) {
@ -272,9 +272,9 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
.setFileSize(file.getSize()) .setFileSize(file.getSize())
.setDataType(EleDataTypeEnum.FILE.code) .setDataType(EleDataTypeEnum.FILE.code)
.setDataStatus(PublishEnum.PUBLISHED.getCode()) .setDataStatus(PublishEnum.PUBLISHED.getCode())
.setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code)
.setSaveStatus(EleDataSaveStatusEnum.FAIL.code) .setSaveStatus(EleDataSaveStatusEnum.FAIL.code)
.setDataOwn(dataOwnCode); .setDataOwn(dataOwnCode)
.setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code);
edFileInfoService.saveOrUpdate(newEdFileInfo); edFileInfoService.saveOrUpdate(newEdFileInfo);
String info = "上传文件失败"; String info = "上传文件失败";
log.error(info, e); log.error(info, e);

18
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -113,12 +113,12 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
.setFileTime(nowTimeStr) .setFileTime(nowTimeStr)
.setDataType(EleDataTypeEnum.FOLDER.code) .setDataType(EleDataTypeEnum.FOLDER.code)
.setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code)
.setEffectFlag(EffectFlagEnum.EFFECT.code)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setFilePath(newPrjId) .setFilePath(newPrjId)
.setSort(++prjCount) .setSort(++prjCount)
.setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr)) .setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr))
.setDataOwn(dataOwnCode); .setDataOwn(dataOwnCode)
.setEffectFlag(EffectFlagEnum.EFFECT.code);
this.save(fileInfo); this.save(fileInfo);
// 保存到文件系统 // 保存到文件系统
String prjPath; String prjPath;
@ -435,7 +435,8 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
String newFolderId = String.valueOf(maxFolderId + 1); String newFolderId = String.valueOf(maxFolderId + 1);
String nowTimeStr = EleCommonUtil.getNowTimeStr(); String nowTimeStr = EleCommonUtil.getNowTimeStr();
String fileCode = commonService.createFileCode(targetId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr); String fileCode = commonService.createFileCode(targetId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr);
EdFileInfo targetFile = new EdFileInfo().setId(newFolderId) EdFileInfo targetFile = new EdFileInfo();
targetFile.setId(newFolderId)
.setFileId(newFolderId) .setFileId(newFolderId)
.setFileName(edFileInfo.getFileName()) .setFileName(edFileInfo.getFileName())
.setFileVersion(FILE_START_VERSION) .setFileVersion(FILE_START_VERSION)
@ -444,12 +445,12 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
.setFileTime(nowTimeStr) .setFileTime(nowTimeStr)
.setDataType(EleDataTypeEnum.FOLDER.code) .setDataType(EleDataTypeEnum.FOLDER.code)
.setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code)
.setEffectFlag(EffectFlagEnum.EFFECT.code)
.setFileCode(fileCode) .setFileCode(fileCode)
.setFileType("文件夹") .setFileType("文件夹")
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setFilePath(prjFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId) .setFilePath(prjFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId)
.setSort(++size); .setSort(++size)
.setEffectFlag(EffectFlagEnum.EFFECT.code);
this.save(targetFile); this.save(targetFile);
targetEdFileInfos.add(targetFile); targetEdFileInfos.add(targetFile);
idMaps.put(edFileInfo.getFileId(), newFolderId); idMaps.put(edFileInfo.getFileId(), newFolderId);
@ -470,7 +471,8 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
String nowTimeStr = EleCommonUtil.getNowTimeStr(); String nowTimeStr = EleCommonUtil.getNowTimeStr();
String fileCode = commonService.createFileCode(targetId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr); String fileCode = commonService.createFileCode(targetId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr);
EdFileInfo targetFile = new EdFileInfo().setId(newFolderId) EdFileInfo targetFile = new EdFileInfo();
targetFile.setId(newFolderId)
.setFileId(newFolderId) .setFileId(newFolderId)
.setFileName(edFileInfo.getFileName()) .setFileName(edFileInfo.getFileName())
.setFileVersion(FILE_START_VERSION) .setFileVersion(FILE_START_VERSION)
@ -479,12 +481,12 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
.setFileTime(nowTimeStr) .setFileTime(nowTimeStr)
.setDataType(EleDataTypeEnum.FOLDER.code) .setDataType(EleDataTypeEnum.FOLDER.code)
.setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code)
.setEffectFlag(EffectFlagEnum.EFFECT.code)
.setFileCode(fileCode) .setFileCode(fileCode)
.setFileType("文件夹") .setFileType("文件夹")
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId) .setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId)
.setSort(edFileInfo.getSort()); .setSort(edFileInfo.getSort())
.setEffectFlag(EffectFlagEnum.EFFECT.code);
this.save(targetFile); this.save(targetFile);
targetEdFileInfos.add(targetFile); targetEdFileInfos.add(targetFile);
idMaps.put(edFileInfo.getFileId(), newFolderId); idMaps.put(edFileInfo.getFileId(), newFolderId);

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java
View File

@ -107,7 +107,6 @@ public class BackupTask {
.setFileId(edFileInfo.getId()) .setFileId(edFileInfo.getId())
.setFileCode(edFileInfo.getFileCode()) .setFileCode(edFileInfo.getFileCode())
.setBackupSuccess(resLog.getBackupSuccess()) .setBackupSuccess(resLog.getBackupSuccess())
.setCreateTime(new Date())
.setStartTime(startTime) .setStartTime(startTime)
.setEndTime(endTime) .setEndTime(endTime)
.setDuration(endTime - startTime) .setDuration(endTime - startTime)
@ -205,7 +204,6 @@ public class BackupTask {
.setFileId(Base64.encode(fileName)) .setFileId(Base64.encode(fileName))
.setFileCode(Base64.encode(fileName)) .setFileCode(Base64.encode(fileName))
.setBackupSuccess(resLog.getBackupSuccess()) .setBackupSuccess(resLog.getBackupSuccess())
.setCreateTime(new Date())
.setStartTime(startTime) .setStartTime(startTime)
.setEndTime(endTime) .setEndTime(endTime)
.setDuration(endTime - startTime) .setDuration(endTime - startTime)