From 97a0bbd8b75c7ba8df78a1e8f67bbaad23edf298 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 24 Apr 2021 15:47:52 +0800
Subject: [PATCH] 1.App警情反馈新增

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 48 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..bd63a81 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.*;
 
 /**
  *  控制器
@@ -173,6 +170,7 @@
 	}
 
 
+
 	@PostMapping("/insertfeed")
 	public R insertfeed(String jid, String snumber, String sname, String addvcd, String place,
 						String result, String describe, String type, String devicenumber, String galarmpeople,
@@ -232,8 +230,53 @@
 		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);
+		return R.data(lists);
 	}
 
+
+	/**
+	 * 警情反馈新增
+	 */
+	@PostMapping("/saves")
+	public R saves(FeedbackVO feedback) {
+		feedbackService.save(feedback);
+		Wj wj = new Wj();
+		//获取视频地址
+		String[] splitsp = feedback.getSpaddress().split(",");//以逗号分割
+		for (String string2 : splitsp) {
+			wj.setJid(feedback.getJid());
+			wj.setAddress(string2);
+			iWjService.insertfeed(wj);
+		}
+		String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
+		for (String string3 : splittp) {
+			wj.setJid(feedback.getJid());
+			wj.setAddress(string3);
+			iWjService.insertfeed(wj);
+		}
+		return R.success("新增成功");
+	}
 }

--
Gitblit v1.9.3