优化代码

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.Optional;
 
 @Component
 public class EdMetaObjectHandler implements MetaObjectHandler {
@@ -28,7 +29,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
             this.strictInsertFill(metaObject, "updatedAt", Date.class, new Date());
         }
         if (metaObject.hasGetter("createdBy")) {
-            this.strictUpdateFill(metaObject, "createdBy", String.class, UserThreadLocal.getUserId());
+            this.strictUpdateFill(metaObject, "createdBy", String.class, Optional.of(UserThreadLocal.getUserId()).orElse(""));
         }
     }
 
@@ -44,7 +45,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
             this.strictUpdateFill(metaObject, "updatedTime", Date.class, new Date());
         }
         if (metaObject.hasGetter("updatedBy")) {
-            this.strictUpdateFill(metaObject, "updatedTime", String.class, UserThreadLocal.getUserId());
+            this.strictUpdateFill(metaObject, "updatedTime", String.class, Optional.of(UserThreadLocal.getUserId()).orElse(""));
         }
     }
 }

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

@@ -188,8 +188,6 @@ public class CommonService {
                 .eq(EdFileInfo::getParentId, parentId));
         List<String> names = edFileInfos.stream().map(EdFileInfo::getFileName).collect(Collectors.toList());
         try {
-            Date now = new Date();
-            String currentUserId = UserThreadLocal.getUserId();
             String path = currentPath + MYSQL_FILE_PATH_SPLIT + folderId;
             EdFileInfo fileInfo = new EdFileInfo();
             String nowTimeStr = EleCommonUtil.getNowTimeStr();
@@ -208,11 +206,7 @@ public class CommonService {
                     .setFilePath(path)
                     .setSort(names.size() + 1)
                     .setFileNote(fileNote)
-                    .setDataOwn(dataOwnCode)
+                    .setDataOwn(dataOwnCode);
-                    .setCreatedTime(now)
-                    .setUpdatedTime(now)
-                    .setCreatedBy(currentUserId)
-                    .setUpdatedBy(currentUserId);
             edFileInfoMapper.insert(fileInfo);
             // 保存到文件系统
             String targetFilePath = getEleDataPath(dataOwnCode) + File.separator + getDbPath(paths) + File.separator + folderName;
@@ -320,8 +314,6 @@ public class CommonService {
                     edFileInfoMapper.update(null, Wrappers.<EdFileInfo>lambdaUpdate()
                             .like(EdFileInfo::getFilePath, id)
                             .set(EdFileInfo::getSort, -1)
-                            .set(EdFileInfo::getUpdatedBy, currentUserId)
-                            .set(EdFileInfo::getUpdatedTime, now)
                             .set(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code));
                     // 层级文件夹重排序
                     List<EdFileInfo> edFileInfos1 = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
@@ -335,8 +327,6 @@ public class CommonService {
                         String tmp = edFileInfos1.get(i).getId();
                         edFileInfoMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
                                 .set(EdFileInfo::getSort, i + 1)
-                                .set(EdFileInfo::getUpdatedBy, currentUserId)
-                                .set(EdFileInfo::getUpdatedTime, now)
                                 .eq(EdFileInfo::getId, tmp));
                     }
                 }
@@ -353,8 +343,6 @@ public class CommonService {
                     // 逻辑删除文件夹
                     edFileInfoMapper.update(null, Wrappers.<EdFileInfo>lambdaUpdate()
                             .eq(EdFileInfo::getId, id)
-                            .set(EdFileInfo::getUpdatedBy, currentUserId)
-                            .set(EdFileInfo::getUpdatedTime, now)
                             .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
                     fileSystemService.renameFile(srcFilePath, srcPrjName + "_" + IdUtil.fastSimpleUUID() + DELETE_FLAG);
                 }
@@ -423,7 +411,6 @@ public class CommonService {
         }
     }
 
-
     public String getLastPrjLeafId(String path) {
         String[] split = path.split(MYSQL_FILE_PATH_SPLIT);
         for (int i = split.length - 1; i >= 0; i--) {
@@ -440,5 +427,4 @@ public class CommonService {
 
     }
 
-
 }

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

@@ -214,8 +214,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         Date now = new Date();
         String currentUserId = UserThreadLocal.getUserId();
         this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
-                .set(EdFileInfo::getUpdatedBy, currentUserId)
-                .set(EdFileInfo::getUpdatedTime, now)
                 .set(EdFileInfo::getEffectFlag, false)
                 .set(EdFileInfo::getAllDeleted, true)
                 .eq(EdFileInfo::getFileId, fileInfo.getFileId()));
@@ -307,8 +305,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             String currentUserId = UserThreadLocal.getUserId();
             this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
                     .eq(EdFileInfo::getId, updateFileInfoDTO.getId())
-                    .set(EdFileInfo::getUpdatedBy, currentUserId)
-                    .set(EdFileInfo::getUpdatedTime, now)
                     .set(EdFileInfo::getFileName, updateFileInfoDTO.getFileName())
                     .set(EdFileInfo::getFileNote, updateFileInfoDTO.getFileNote()));
             String newName = updateFileInfoDTO.getFileName() + "." + fileInfo.getFileType() + "." + fileInfo.getFileCode();

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

@@ -101,11 +101,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
                     .setFilePath(newPrjId)
                     .setSort(++prjCount)
                     .setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr))
-                    .setDataOwn(dataOwnCode)
+                    .setDataOwn(dataOwnCode);
-                    .setCreatedTime(now)
-                    .setUpdatedTime(now)
-                    .setCreatedBy(currentUserId)
-                    .setUpdatedBy(currentUserId);
             this.save(fileInfo);
             // 保存到文件系统
             fileSystemService.createDirectory(commonService.getEleDataPath(dataOwnCode) + File.separator + prjName);
@@ -152,9 +148,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             }
             this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
                     .eq(EdFileInfo::getId, prjId)
-                    .set(EdFileInfo::getFileName, newPrjName)
+                    .set(EdFileInfo::getFileName, newPrjName));
-                    .set(EdFileInfo::getUpdatedBy, UserThreadLocal.getUserId())
-                    .set(EdFileInfo::getUpdatedTime, new Date()));
             fileSystemService.renameFile(commonService.getEleDataPath(dataOwnCode), oldPrjName, newPrjName);
             UserThreadLocal.setSuccessInfo("", prjId, "修改工层名 {} 为 {} 成功。", oldPrjName, newPrjName);
         } catch (Exception e) {
@@ -265,8 +259,6 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             for (FolderResortDTO folderResortDTO : folderResortDTOList) {
                 LambdaUpdateWrapper<EdFileInfo> updateWrapper = Wrappers.lambdaUpdate(EdFileInfo.class)
                         .set(EdFileInfo::getSort, folderResortDTO.getSort())
-                        .set(EdFileInfo::getUpdatedBy, currentUserId)
-                        .set(EdFileInfo::getUpdatedTime, now)
                         .eq(EdFileInfo::getId, folderResortDTO.getId());
                 this.update(updateWrapper);
             }
@@ -307,15 +299,11 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             this.update(Wrappers.lambdaUpdate(EdFileInfo.class)
                     .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)
                     .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
-                    .set(EdFileInfo::getUpdatedBy, currentUserId)
-                    .set(EdFileInfo::getUpdatedTime, now)
                     .likeRight(EdFileInfo::getFilePath, prjId));
             // 其余置为发布状态
             LambdaUpdateWrapper<EdFileInfo> updateWrapper = Wrappers.lambdaUpdate(EdFileInfo.class)
                     .set(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code)
                     .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
-                    .set(EdFileInfo::getUpdatedBy, currentUserId)
-                    .set(EdFileInfo::getUpdatedTime, now)
                     .likeRight(EdFileInfo::getFilePath, prjId);
             this.update(updateWrapper);
             commonService.deletePrjSysDir(fileSysPaths);
@@ -408,11 +396,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
                                 .setFileType("文件夹")
                                 .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                                 .setFilePath(targetParentFile.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId)
-                                .setSort(++sort)
+                                .setSort(++sort);
-                                .setCreatedTime(now)
-                                .setUpdatedTime(now)
-                                .setCreatedBy(currentUserId)
-                                .setUpdatedBy(currentUserId);
                         this.save(targetFile);
                         targetEdFileInfos.add(targetFile);
                         String targetSysFilePath = commonService.getFileSysPath(targetFile.getFilePath(), dataOwnCode);
@@ -458,8 +442,6 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
                     .eq(EdFileInfo::getId, id));
             String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath(), dataOwnCode);
             this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
-                    .set(EdFileInfo::getUpdatedTime, now)
-                    .set(EdFileInfo::getUpdatedBy, currentUserId)
                     .eq(EdFileInfo::getId, id)
                     .set(EdFileInfo::getFileName, newFolderName));
             fileSystemService.renameFile(sysFilePath, newFolderName);