diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java index e1ed0c1..f139495 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java @@ -14,6 +14,4 @@ public class FileFormat extends BaseModel { private String suffixNo; private String suffixName; - - private Integer effectFlag; } 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 f80ee3f..cf1416f 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 @@ -250,12 +250,12 @@ public class CommonService { .setFileTime(nowTimeStr) .setDataType(EleDataTypeEnum.FOLDER.code) .setDataStatus(DataOwnEnum.isPrjCode(dataOwnCode) ? EleDataStatusEnum.NOT_PUBLISHED.code : EleDataStatusEnum.PUBLISHED.code) - .setEffectFlag(EffectFlagEnum.EFFECT.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setFilePath(path) .setSort(names.size() + 1) .setFileNote(fileNote) - .setDataOwn(dataOwnCode); + .setDataOwn(dataOwnCode) + .setEffectFlag(EffectFlagEnum.EFFECT.code); edFileInfoMapper.insert(fileInfo); // 保存到文件系统 String targetFilePath; 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 d0e9765..7cf450c 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 @@ -1037,6 +1037,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl 0) { @@ -272,9 +272,9 @@ public class EdFileRelationServiceImpl extends ServiceImpl .setFileTime(nowTimeStr) .setDataType(EleDataTypeEnum.FOLDER.code) .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) - .setEffectFlag(EffectFlagEnum.EFFECT.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setFilePath(newPrjId) .setSort(++prjCount) .setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr)) - .setDataOwn(dataOwnCode); + .setDataOwn(dataOwnCode) + .setEffectFlag(EffectFlagEnum.EFFECT.code); this.save(fileInfo); // 保存到文件系统 String prjPath; @@ -435,7 +435,8 @@ public class EdPrjServiceImpl extends ServiceImpl String newFolderId = String.valueOf(maxFolderId + 1); String nowTimeStr = EleCommonUtil.getNowTimeStr(); 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) .setFileName(edFileInfo.getFileName()) .setFileVersion(FILE_START_VERSION) @@ -444,12 +445,12 @@ public class EdPrjServiceImpl extends ServiceImpl .setFileTime(nowTimeStr) .setDataType(EleDataTypeEnum.FOLDER.code) .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) - .setEffectFlag(EffectFlagEnum.EFFECT.code) .setFileCode(fileCode) .setFileType("文件夹") .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setFilePath(prjFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId) - .setSort(++size); + .setSort(++size) + .setEffectFlag(EffectFlagEnum.EFFECT.code); this.save(targetFile); targetEdFileInfos.add(targetFile); idMaps.put(edFileInfo.getFileId(), newFolderId); @@ -470,7 +471,8 @@ public class EdPrjServiceImpl extends ServiceImpl String nowTimeStr = EleCommonUtil.getNowTimeStr(); 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) .setFileName(edFileInfo.getFileName()) .setFileVersion(FILE_START_VERSION) @@ -479,12 +481,12 @@ public class EdPrjServiceImpl extends ServiceImpl .setFileTime(nowTimeStr) .setDataType(EleDataTypeEnum.FOLDER.code) .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) - .setEffectFlag(EffectFlagEnum.EFFECT.code) .setFileCode(fileCode) .setFileType("文件夹") .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId) - .setSort(edFileInfo.getSort()); + .setSort(edFileInfo.getSort()) + .setEffectFlag(EffectFlagEnum.EFFECT.code); this.save(targetFile); targetEdFileInfos.add(targetFile); idMaps.put(edFileInfo.getFileId(), newFolderId); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java index a31ccc6..11115c2 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java @@ -107,7 +107,6 @@ public class BackupTask { .setFileId(edFileInfo.getId()) .setFileCode(edFileInfo.getFileCode()) .setBackupSuccess(resLog.getBackupSuccess()) - .setCreateTime(new Date()) .setStartTime(startTime) .setEndTime(endTime) .setDuration(endTime - startTime) @@ -205,7 +204,6 @@ public class BackupTask { .setFileId(Base64.encode(fileName)) .setFileCode(Base64.encode(fileName)) .setBackupSuccess(resLog.getBackupSuccess()) - .setCreateTime(new Date()) .setStartTime(startTime) .setEndTime(endTime) .setDuration(endTime - startTime)