From 5814550ca780067f20d6494b5fe8baf729a67dd9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 07 五月 2023 16:47:14 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
index 5521fab..d628dce 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
@@ -9,11 +9,14 @@
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
+import com.ruoyi.shop.util.FileConvertUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,17 +48,23 @@
if(merMemberTaskRecordPageVoList!=null&&!merMemberTaskRecordPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
- String picture;
- String video;
- String audio;
+ List<String> picture = new ArrayList<>();
+ List<String> video = new ArrayList<>();
+ List<String> audio = new ArrayList<>();
for(MerMemberTaskRecordPageVo merMemberTaskRecordPageVo : merMemberTaskRecordPageVoList){
followId = merMemberTaskRecordPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
- picture = convertFileListToString(taskFileList);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
- video = convertFileListToString(taskFileList);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
- audio = convertFileListToString(taskFileList);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
merMemberTaskRecordPageVo.setPicture(picture);
merMemberTaskRecordPageVo.setVideo(video);
merMemberTaskRecordPageVo.setAudio(audio);
@@ -64,15 +73,4 @@
return merMemberTaskRecordPageVoList;
}
- private String convertFileListToString(List<TaskFile> taskFileList){
- StringJoiner sj = new StringJoiner(",");
- if(taskFileList!=null&&!taskFileList.isEmpty()){
- for(TaskFile taskFile : taskFileList){
- sj.add(taskFile.getFileUrl());
- }
- return sj.toString();
- }else{
- return null;
- }
- }
}
--
Gitblit v1.7.1