24282 vor 2 Jahren
Ursprung
Commit
3abb149157

+ 1 - 1
hx-file/src/main/java/com/fjhx/file/controller/FileInfoController.java

@@ -45,7 +45,7 @@ public class FileInfoController {
      * 文件表列表
      */
     @PostMapping("/getList")
-    public Map<String, List<FileInfoVo>> getList(@Validated @RequestBody FileInfoSelectDto dto) {
+    public Map<Long, List<FileInfoVo>> getList(@Validated @RequestBody FileInfoSelectDto dto) {
         return fileInfoService.getList(dto);
     }
 

+ 6 - 1
hx-file/src/main/java/com/fjhx/file/entity/FileInfoVo.java

@@ -16,7 +16,7 @@ public class FileInfoVo {
     /**
      * 文件id
      */
-    private String id;
+    private Long id;
 
     /**
      * 文件链接
@@ -28,4 +28,9 @@ public class FileInfoVo {
      */
     private String fileName;
 
+    /**
+     * 业务id
+     */
+    private Long businessId;
+
 }

+ 1 - 1
hx-file/src/main/java/com/fjhx/file/service/FileInfoService.java

@@ -24,7 +24,7 @@ public interface FileInfoService extends BaseService<FileInfo> {
     /**
      * 文件表列表
      */
-    Map<String, List<FileInfoVo>> getList(FileInfoSelectDto dto);
+    Map<Long, List<FileInfoVo>> getList(FileInfoSelectDto dto);
 
     /**
      * 保存文件

+ 4 - 6
hx-file/src/main/java/com/fjhx/file/service/impl/FileInfoServiceImpl.java

@@ -112,7 +112,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     }
 
     @Override
-    public Map<String, List<FileInfoVo>> getList(FileInfoSelectDto dto) {
+    public Map<Long, List<FileInfoVo>> getList(FileInfoSelectDto dto) {
 
         if (ObjectUtil.isEmpty(dto.getBusinessIdList())) {
             return new HashMap<>();
@@ -127,11 +127,9 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
             return new HashMap<>();
         }
 
-        for (FileInfoVo fileInfoVo : list) {
-            fileInfoVo.setFileUrl(url + fileInfoVo.getFileUrl());
-        }
-
-        return list.stream().collect(Collectors.groupingBy(FileInfoVo::getId));
+        return list.stream()
+                .peek(fileInfoVo -> fileInfoVo.setFileUrl(url + fileInfoVo.getFileUrl()))
+                .collect(Collectors.groupingBy(FileInfoVo::getBusinessId));
     }
 
     /**

+ 2 - 1
hx-file/src/main/resources/mapper/file/FileInfoMapper.xml

@@ -5,7 +5,8 @@
     <select id="getList" resultType="com.fjhx.file.entity.FileInfoVo">
         select fi.id,
                fi.file_url,
-               fi.file_name
+               fi.file_name,
+               fi.business_id
         from file_info fi
             ${ew.customSqlSegment}
     </select>