From efcf899114ad22e553f8f2b055e0c17426403bfc Mon Sep 17 00:00:00 2001 From: chenxudong Date: Thu, 17 Apr 2025 16:39:08 +0800 Subject: [PATCH] clean code --- .../manage/config/EdMetaObjectHandler.java | 22 ++++--------------- .../RepoEdFileRelationController.java | 1 + .../UserEdFileRelationController.java | 1 - .../pojo/models/AiFileUploadRecord.java | 3 --- .../manage/pojo/models/AiQuestionRecord.java | 2 -- .../manage/pojo/models/EdFileFavorite.java | 1 - .../manage/pojo/models/EdFileRelation.java | 2 +- .../manage/pojo/models/FileTagRelation.java | 6 ++--- .../manage/service/EdFileFavoriteService.java | 3 ++- .../manage/service/EdFileRelationService.java | 2 -- .../EdFileFavoriteServiceImpl.java | 6 ++--- .../EdFileRelationServiceImpl.java | 8 ++++--- 12 files changed, 19 insertions(+), 38 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 160c304..d75870a 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 @@ -1,6 +1,7 @@ package com.electromagnetic.industry.software.manage.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.pojo.UserLoginInfo; import com.electromagnetic.industry.software.common.util.UserThreadLocal; import org.apache.ibatis.reflection.MetaObject; @@ -14,21 +15,9 @@ public class EdMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { - if (metaObject.hasSetter("gmtCreate")) { - this.strictInsertFill(metaObject, "gmtCreate", Date.class, new Date()); - } - if (metaObject.hasGetter("createdAt")) { - this.strictInsertFill(metaObject, "createdAt", Date.class, new Date()); - } if (metaObject.hasGetter("createdTime")) { this.setFieldValByName("createdTime", new Date(), metaObject); } - if (metaObject.hasGetter("gmtModified")) { - this.strictInsertFill(metaObject, "gmtModified", Date.class, new Date()); - } - if (metaObject.hasGetter("updatedAt")) { - this.strictInsertFill(metaObject, "updatedAt", Date.class, new Date()); - } if (metaObject.hasGetter("createdBy")) { this.setFieldValByName("createdBy", Optional.ofNullable(UserThreadLocal.getUser()).map(UserLoginInfo::getUserId).orElse(""), metaObject); } @@ -38,16 +27,13 @@ public class EdMetaObjectHandler implements MetaObjectHandler { if (metaObject.hasGetter("updatedBy")) { this.setFieldValByName("updatedBy", Optional.ofNullable(UserThreadLocal.getUser()).map(UserLoginInfo::getUserId).orElse(""), metaObject); } + if (metaObject.hasGetter("effectFlag")) { + this.setFieldValByName("effectFlag", EffectFlagEnum.EFFECT.code, metaObject); + } } @Override public void updateFill(MetaObject metaObject) { - if (metaObject.hasGetter("gmtModified")) { - this.strictUpdateFill(metaObject, "gmtModified", Date.class, new Date()); - } - if (metaObject.hasGetter("updatedAt")) { - this.strictUpdateFill(metaObject, "updatedAt", Date.class, new Date()); - } if (metaObject.hasGetter("updatedTime")) { this.setFieldValByName("updatedTime", new Date(), metaObject); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileRelationController.java index 78d63c7..48da807 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileRelationController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileRelationController.java @@ -25,6 +25,7 @@ public class RepoEdFileRelationController { @Resource EdFileInfoService edFileInfoService; + /** * 创建文件关系 * diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java index 9155f83..1a31966 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java @@ -12,7 +12,6 @@ import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequ import com.electromagnetic.industry.software.manage.pojo.req.UpdateRelationDTO; import com.electromagnetic.industry.software.manage.service.EdFileInfoService; import com.electromagnetic.industry.software.manage.service.EdFileRelationService; -import com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileRelationServiceImpl; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiFileUploadRecord.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiFileUploadRecord.java index d0ad7d8..c99e06f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiFileUploadRecord.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiFileUploadRecord.java @@ -27,7 +27,4 @@ public class AiFileUploadRecord extends BaseModel { @TableField(value = "file_size") private long fileSize; - @TableField(value = "effect_flag") - private Integer effectFlag; - } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java index 8ac1bf3..28e9fc0 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java @@ -17,6 +17,4 @@ public class AiQuestionRecord extends BaseModel { @TableField(value = "question") private String question; - @TableField(value = "effect_flag") - private Integer effectFlag; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java index 563d45a..3f69c89 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; -import com.electromagnetic.industry.software.common.util.EleCommonUtil; import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java index 499fb85..fc9ee80 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java @@ -13,7 +13,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("ed_file_relation") -public class EdFileRelation extends BaseModel{ +public class EdFileRelation extends BaseModel { private String id; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java index ce029ee..bfc55d9 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java @@ -1,10 +1,10 @@ package com.electromagnetic.industry.software.manage.pojo.models; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.util.Date; - @Data @TableName("file_tag_relations") public class FileTagRelation extends BaseModel { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileFavoriteService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileFavoriteService.java index 80069c5..fa33798 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileFavoriteService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileFavoriteService.java @@ -7,10 +7,11 @@ public interface EdFileFavoriteService extends IService { /** * 逻辑删除 + * * @param userId * @param fileId * @return */ - public boolean logicRemove (String userId, String fileId); + public boolean logicRemove(String userId, String fileId); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java index 3b258c8..a1c9d6d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java @@ -1,11 +1,9 @@ package com.electromagnetic.industry.software.manage.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation; import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest; import com.electromagnetic.industry.software.manage.pojo.resp.FileRelationViewVO; -import org.springframework.web.multipart.MultipartFile; public interface EdFileRelationService extends IService { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileFavoriteServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileFavoriteServiceImpl.java index f47b9ae..d1eca95 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileFavoriteServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileFavoriteServiceImpl.java @@ -1,6 +1,5 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -15,12 +14,13 @@ public class EdFileFavoriteServiceImpl extends ServiceImpl updateWrapper = Wrappers.lambdaUpdate(EdFileFavorite.class) + public boolean logicRemove(String userId, String fileId) { + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(EdFileFavorite.class) .eq(EdFileFavorite::getUserId, userId) .eq(EdFileFavorite::getFileId, fileId) .set(EdFileFavorite::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java index b027b6b..bcb7834 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java @@ -5,9 +5,11 @@ import cn.hutool.core.text.StrFormatter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.electromagnetic.industry.software.common.enums.*; +import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; +import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum; import com.electromagnetic.industry.software.common.exception.BizException; -import com.electromagnetic.industry.software.common.util.*; +import com.electromagnetic.industry.software.common.util.EleCommonUtil; +import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper; import com.electromagnetic.industry.software.manage.mapper.EdFileRelationMapper; import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo; @@ -24,7 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; -import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*; +import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.NAME_VALID_MSG; @Service public class EdFileRelationServiceImpl extends ServiceImpl implements EdFileRelationService {