From 921918301e29c95c6642596c346f016340a84a05 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 22 Apr 2021 08:43:35 +0800
Subject: [PATCH] 1.反馈查询接口 2.设备部署信息
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 6295273..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
@@ -230,12 +230,29 @@
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);
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("wj",map);
+ maps.put("tp",arlistj);
+ maps.put("sp",arlistm);
lists.add(maps);
+ lists.clear();
return R.data(lists);
}
--
Gitblit v1.9.3