electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileTagController.java

@@ -1,31 +0,0 @@
-package com.electromagnetic.industry.software.manage.controller;
-
-import com.electromagnetic.industry.software.common.annotations.UserOperation;
-import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
-import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
-import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
-import com.electromagnetic.industry.software.common.util.UserThreadLocal;
-import com.electromagnetic.industry.software.manage.pojo.req.TagCreateDTO;
-import com.electromagnetic.industry.software.manage.service.FileTagRelationService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/data/ed/user/tag")
-public class UserEdFileTagController {
-
-    @Resource
-    private FileTagRelationService fileTagRelationService;
-
-    // 批量添加标签到文件
-    @PostMapping("/addTagsToFile")
-    @UserOperation(value="批量添加了标签到文件", modelName = UserOperationModuleEnum.TAG)
-    public ElectromagneticResult<?> addTagsToFile(@RequestBody TagCreateDTO dto) {
-        String createdBy = UserThreadLocal.getUserId();
-        return ElectromagneticResultUtil.success(fileTagRelationService.addTagsToFile(dto.getFileId(), dto.getTagIds(), createdBy));
-    }
-}

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

@@ -143,7 +143,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         }
 
         // 处理 tagIds 查询
-        if (CollUtil.isNotEmpty(pars.getTagIds())) {
+        if (!pars.getTagIds().isEmpty()) {
             List<String> fileIdsWithTags = fileTagRelationService.getFileIdsByTagIds(pars.getTagIds());
             if (fileIdsWithTags.isEmpty()) {
                 return ElectromagneticResultUtil.success(new RespPageVO<>(0, new ArrayList<>()));

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

@@ -40,7 +40,6 @@ public class FileFormatServiceImpl extends ServiceImpl<FileFormatMapper, FileFor
             fileFormat.setEffectFlag(EffectFlagEnum.EFFECT.code);
             fileFormat.setId(IdWorker.getSnowFlakeIdString());
             fileFormat.setSuffixNo(createFileFormatNo(fileFormats.size()));
-            fileFormat.setCreatedBy(UserThreadLocal.getUserId());
             this.baseMapper.insert(fileFormat);
         }
         UserThreadLocal.setSuccessInfo("","", StrFormatter.format("添加了文件格式 {} ", suffixName));

electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml

@@ -40,9 +40,7 @@
                     #{id}
                 </foreach>
             </if>
-            <if test="ids == null or ids.size() == 0">
-                AND 1 = 0 <!-- 添加一个永远为假的条件 -->
-            </if>
+
             <if test="pars.dataStatus != null">
                 AND data_status = #{pars.dataStatus}
             </if>