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

解决发现的问题。

This commit is contained in:
chenxudong 2025-03-13 09:28:54 +08:00
parent 8213bbf18c
commit 1d37a302be
6 changed files with 11 additions and 10 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/config/EdMetaObjectHandler.java
View File

@ -29,7 +29,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
this.strictInsertFill(metaObject, "updatedAt", Date.class, new Date()); this.strictInsertFill(metaObject, "updatedAt", Date.class, new Date());
} }
if (metaObject.hasGetter("createdBy")) { if (metaObject.hasGetter("createdBy")) {
this.setFieldValByName("createdBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject); this.setFieldValByName("createdBy", Optional.ofNullable(UserThreadLocal.getUserId()).orElse(""), metaObject);
} }
} }
@ -45,7 +45,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
this.setFieldValByName("updatedTime", new Date(), metaObject); this.setFieldValByName("updatedTime", new Date(), metaObject);
} }
if (metaObject.hasGetter("updatedBy")) { if (metaObject.hasGetter("updatedBy")) {
this.setFieldValByName("updatedBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject); this.setFieldValByName("updatedBy", Optional.ofNullable(UserThreadLocal.getUserId()).orElse(""), metaObject);
} }
} }
} }

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
View File

@ -46,7 +46,7 @@ public class EdFileRelationController {
public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) { public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) {
LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship()); wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship());
boolean isUpdated = edFileRelationService.update(wrapper); boolean isUpdated = edFileRelationService.update(new EdFileRelation(), wrapper);
if (isUpdated) { if (isUpdated) {
UserThreadLocal.setSuccessInfo("", updateRelation.getRelationId(), "更新了文件关系"); UserThreadLocal.setSuccessInfo("", updateRelation.getRelationId(), "更新了文件关系");
} }

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

@ -161,7 +161,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
newEdFileInfo.newInit(); newEdFileInfo.newInit();
// 首先检查是否是同名文件 // 首先检查是否是同名文件
Assert.isTrue(EleCommonUtil.isFileNameValid(mainName + "." + suffix), NAME_VALID_MSG); Assert.isTrue(EleCommonUtil.isFileNameValid(mainName + "." + suffix), NAME_VALID_MSG);
Long count = edFileInfoService.count(Wrappers.lambdaQuery(EdFileInfo.class) long count = edFileInfoService.count(Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getParentId, parentId) .eq(EdFileInfo::getParentId, parentId)
.eq(EdFileInfo::getFileName, mainName) .eq(EdFileInfo::getFileName, mainName)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
View File

@ -152,7 +152,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
.setFileName(saveFileName) .setFileName(saveFileName)
.setFileCode(commonService.getFileCode(fileSysPath)) .setFileCode(commonService.getFileCode(fileSysPath))
.setFileCreateTime(edFileInfo.getCreatedTime()) .setFileCreateTime(edFileInfo.getCreatedTime())
.setSource(FileBackupSource.SYS_BACKUP.code); .setSource(FileBackupSource.REMOVE.code);
if (backup.getBackupSuccess()) { if (backup.getBackupSuccess()) {
backupLog.setBackupSuccess(true); backupLog.setBackupSuccess(true);

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

@ -112,16 +112,19 @@ public class BackupTask {
.setFileCreateTime(edFileInfo.getCreatedTime()) .setFileCreateTime(edFileInfo.getCreatedTime())
.setSource(FileBackupSource.SYS_BACKUP.code); .setSource(FileBackupSource.SYS_BACKUP.code);
fileBackupLogMapper.insert(backupLog); fileBackupLogMapper.insert(backupLog);
} }
} }
private Date getFileMaxCreateTime() { private Date getFileMaxCreateTime() {
List<FileBackupLog> fileBackupLogs = fileBackupLogMapper.selectList(Wrappers.<FileBackupLog>lambdaQuery().orderByDesc(FileBackupLog::getFileCreateTime).last("limit 1")); List<FileBackupLog> fileBackupLogs = fileBackupLogMapper.selectList(Wrappers.<FileBackupLog>lambdaQuery()
.eq(FileBackupLog::getSource, FileBackupSource.SYS_BACKUP.code)
.orderByDesc(FileBackupLog::getFileCreateTime)
.last("limit 1"));
if (CollUtil.isNotEmpty(fileBackupLogs)) { if (CollUtil.isNotEmpty(fileBackupLogs)) {
return fileBackupLogs.get(0).getFileCreateTime(); return fileBackupLogs.get(0).getFileCreateTime();
} }
return new Date(); // 此处先写一个魔鬼字段值
return DateUtil.parse("2000-1-1 01:00:00");
} }
public List<String> getFailBackFile() { public List<String> getFailBackFile() {

2
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java
View File

@ -25,8 +25,6 @@ public class UserThreadLocal {
} }
public static String getUserId() { public static String getUserId() {
// return "1876888149980930048";
return userThread.get().getUserId(); return userThread.get().getUserId();
} }