From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
index 4d2b93c..ce81a85 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
@@ -40,10 +40,7 @@
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
/**
* 控制器
@@ -232,8 +229,31 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
+ Map<String, Object> maps = new HashMap<String, Object>();
+ //保存视频的数组
+ ArrayList <String> arlistm = new ArrayList <String>();
+ //保存图片的数组
+ ArrayList <String> arlistj = new ArrayList <String>();
+ List<Map<String, Object>> lists = new ArrayList<>();
List<FeedbackVO> feedbackVOS = feedbackService.selectFeedEdit(jid);
- return R.data(feedbackVOS);
+ List<Map<String, Object>> map = feedbackService.selectWjEdit(jid);
+ for (int i=0;i<map.size();i++){
+ Object address = map.get(i).get("address");
+ String addr = address.toString();
+ String substring = addr.substring(addr.length() - 4, addr.length());
+ if (substring.equals(".mp4")){
+ arlistm.add(addr);
+ }
+ else if (substring.equals(".jpg")){
+ arlistj.add(addr);
+ }
+ }
+ maps.put("List",feedbackVOS);
+ maps.put("tp",arlistj);
+ maps.put("sp",arlistm);
+ lists.add(maps);
+ lists.clear();
+ return R.data(lists);
}
}
--
Gitblit v1.9.3