Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

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

@@ -0,0 +1,31 @@
+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/pojo/req/FileInfoQueryDTO.java

@@ -2,6 +2,8 @@ package com.electromagnetic.industry.software.manage.pojo.req;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class FileInfoQueryDTO {
 
@@ -65,4 +67,9 @@ public class FileInfoQueryDTO {
      * 状态（0-未发布 1-已发布 2-占用）
      */
     private Integer dataStatus;
+
+    /**
+     * 标签查询ID列表
+     */
+    private List<String> tagIds;
 }

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

@@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.electromagnetic.industry.software.common.pojo.TreeNode;
 import com.electromagnetic.industry.software.manage.pojo.models.EdTagLibrary;
+import com.electromagnetic.industry.software.manage.pojo.resp.FileTagInfo;
 import com.electromagnetic.industry.software.manage.pojo.resp.TagListVO;
 
 import javax.swing.text.html.HTML;
@@ -69,5 +70,5 @@ public interface EdTagLibraryService extends IService<EdTagLibrary> {
      * 获取所有标签
      * @return
      */
-    List<EdTagLibrary> listAllTags();
+    List<FileTagInfo> listAllTags();
 }

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

@@ -24,4 +24,11 @@ public interface FileTagRelationService extends IService<FileTagRelation> {
      * @return
      */
     List<FileTagInfo> getFileTags (String fileId);
+
+    /**
+     * 根据标签id获取文件id
+     * @param tagIds
+     * @return
+     */
+    List<String> getFileIdsByTagIds(List<String> tagIds);
 }

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

@@ -97,7 +97,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             throw new PermissionDeniedException();
         }
 
-
         LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
                 .select(EdFileInfo.class, file -> !file.getColumn().equals("file_content"))
                 .eq(EdFileInfo::getSaveStatus, EleDataSaveStatusEnum.SUCCESS.code)
@@ -142,6 +141,16 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .or()
                     .like(EdFileInfo::getFileContent, pars.getKeyword()));
         }
+
+        // 处理 tagIds 查询
+        if (CollUtil.isNotEmpty(pars.getTagIds())) {
+            List<String> fileIdsWithTags = fileTagRelationService.getFileIdsByTagIds(pars.getTagIds());
+            if (fileIdsWithTags.isEmpty()) {
+                return ElectromagneticResultUtil.success(new RespPageVO<>(0, new ArrayList<>()));
+            }
+            queryWrapper.in(EdFileInfo::getId, fileIdsWithTags);
+        }
+
         Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
         long total = edFileInfoPage.getTotal();
         List<FileInfoVO> records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileInfoVO.class);

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

@@ -14,6 +14,7 @@ import com.electromagnetic.industry.software.common.util.IdWorker;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
 import com.electromagnetic.industry.software.manage.mapper.EdTagLibraryMapper;
 import com.electromagnetic.industry.software.manage.pojo.models.EdTagLibrary;
+import com.electromagnetic.industry.software.manage.pojo.resp.FileTagInfo;
 import com.electromagnetic.industry.software.manage.pojo.resp.TagListVO;
 import com.electromagnetic.industry.software.manage.service.EdTagLibraryService;
 import org.springframework.beans.BeanUtils;
@@ -306,11 +307,16 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
      * @return
      */
     @Override
-    public List<EdTagLibrary> listAllTags() {
+    public List<FileTagInfo> listAllTags() {
         LambdaQueryWrapper<EdTagLibrary> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EdTagLibrary::getIsPublished, PublishEnum.PUBLISHED.getCode())
                 .eq(EdTagLibrary::getType, TagTypeEnum.TAG.getCode());
-        return this.list(queryWrapper);
+        return this.list(queryWrapper).stream()
+                .map(tag -> {
+                    FileTagInfo info = new FileTagInfo();
+                    BeanUtils.copyProperties(tag, info);
+                    return info;
+                }).collect(Collectors.toList());
     }
 }
 

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

@@ -41,6 +41,7 @@ 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/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class FileTagRelationServiceImpl extends ServiceImpl<FileTagRelationMapper, FileTagRelation> implements FileTagRelationService {
@@ -84,4 +85,20 @@ public class FileTagRelationServiceImpl extends ServiceImpl<FileTagRelationMappe
         UserThreadLocal.setSuccessInfo("", "", "获取了标签数据");
         return result;
     }
+
+    /**
+     * 根据 tagIds 获取文件 ID 列表
+     * @param tagIds
+     * @return
+     */
+    @Override
+    public List<String> getFileIdsByTagIds(List<String> tagIds) {
+        LambdaQueryWrapper<FileTagRelation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(FileTagRelation::getTagId, tagIds);
+        List<FileTagRelation> relations = this.list(queryWrapper);
+        return relations.stream()
+                .map(FileTagRelation::getFileId)
+                .distinct()
+                .collect(Collectors.toList());
+    }
 }

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

@@ -40,7 +40,9 @@
                     #{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>