From b2063c6219a7861fb02a6f45bebef0ca1f0838d7 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 5 Mar 2025 13:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/config/EdMetaObjectHandler.java | 8 ++++---- .../software/manage/controller/FileFormatController.java | 2 +- .../software/manage/controller/FileRecycleController.java | 2 +- .../software/manage/pojo/resp/FileRecycleQueryVO.java | 2 +- .../manage/service/serviceimpl/FileFormatServiceImpl.java | 3 ++- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java index 7056ec1..a3952fd 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java @@ -20,7 +20,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler { this.strictInsertFill(metaObject, "createdAt", Date.class, new Date()); } if (metaObject.hasGetter("createdTime")) { - this.strictInsertFill(metaObject, "createdTime", Date.class, new Date()); + this.setFieldValByName("createdTime", new Date(), metaObject); } if (metaObject.hasGetter("gmtModified")) { this.strictInsertFill(metaObject, "gmtModified", Date.class, new Date()); @@ -29,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, Optional.of(UserThreadLocal.getUserId()).orElse("")); + this.setFieldValByName("createdBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject); } } @@ -42,10 +42,10 @@ public class EdMetaObjectHandler implements MetaObjectHandler { this.strictUpdateFill(metaObject, "updatedAt", Date.class, new Date()); } if (metaObject.hasGetter("updatedTime")) { - this.strictUpdateFill(metaObject, "updatedTime", Date.class, new Date()); + this.setFieldValByName("updatedTime", new Date(), metaObject); } if (metaObject.hasGetter("updatedBy")) { - this.strictUpdateFill(metaObject, "updatedTime", String.class, Optional.of(UserThreadLocal.getUserId()).orElse("")); + this.setFieldValByName("updatedBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject); } } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java index cc2c6f3..bd4d424 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java @@ -16,7 +16,7 @@ public class FileFormatController { @Resource private FileFormatService fileFormatService; - @PostMapping("/add") + @GetMapping("/add") @UserOperation(value = "新增文件格式", modelName = UserOperationModuleEnum.DATABASE) public ElectromagneticResult addFileFormat(@RequestParam String suffixName) { return ElectromagneticResultUtil.success(fileFormatService.addFileFormat(suffixName)); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java index 5ceb3db..0ee48a5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java @@ -26,7 +26,7 @@ public class FileRecycleController { } @RequestMapping("remove") - @UserOperation(value = "物理删除", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "彻底清除文件", modelName = UserOperationModuleEnum.DATABASE) public ElectromagneticResult remove(@RequestParam String fileId) { return fileRecycleService.remove(fileId); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java index cc6b0ba..acb2060 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java @@ -17,7 +17,7 @@ public class FileRecycleQueryVO { private String fileVersion; - private Date updateTime; + private Date updatedTime; private String fileNote; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java index 39374a8..7b07f60 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java @@ -13,6 +13,7 @@ import com.electromagnetic.industry.software.manage.pojo.models.FileFormat; import com.electromagnetic.industry.software.manage.pojo.resp.FileFormatVO; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -72,7 +73,7 @@ public class FileFormatServiceImpl extends ServiceImpl getList() { - List fileFormats = this.baseMapper.selectList(Wrappers.lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code)); + List fileFormats = this.baseMapper.selectList(Wrappers.lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByDesc(FileFormat::getCreatedTime)); List fileFormatVOS = BeanUtil.copyToList(fileFormats, FileFormatVO.class); UserThreadLocal.setSuccessInfo("","", "查询了文件格式列表"); return fileFormatVOS;