From a4ff2b571be305e2641c9dd67797f4102e795ebb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 10:47:56 +0800
Subject: [PATCH] 1.App警情反馈接口调整 2.租户接口新增
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 91 insertions(+), 16 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..10d60be 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
@@ -27,10 +27,13 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.jfpt.alarm.service.IAlarmService;
import org.springblade.jfpt.feedback.entity.Feedback;
import org.springblade.jfpt.feedback.service.IFeedbackService;
import org.springblade.jfpt.feedback.vo.FeedbackVO;
import org.springblade.jfpt.feedback.wrapper.FeedbackWrapper;
+import org.springblade.jfpt.operation.entity.Operation;
+import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.wj.entity.Wj;
import org.springblade.jfpt.wj.service.IWjService;
import org.springframework.web.bind.annotation.*;
@@ -40,10 +43,11 @@
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2020-07-14
@@ -55,7 +59,9 @@
public class FeedbackController extends BladeController {
private final IFeedbackService feedbackService;
+ private final IAlarmService alarmService;
private IWjService iWjService;
+ private final IOperationService operationService;
/**
* 详情
@@ -134,6 +140,7 @@
/**
* 图片上传
+ *
* @param file
* @return
* @throws IOException
@@ -145,9 +152,9 @@
String fileExtension = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
String s = UUID.randomUUID().toString().replace("-", "");
String fileName = s + fileExtension;
- String path ="D:/nginx-1.12.2/images/";
+ String path = "D:/nginx-1.12.2/images/";
//检查该路径对应的目录是否存在. 如果不存在则创建目录
- File dir=new File(path);
+ File dir = new File(path);
if (!dir.exists()) {
dir.mkdirs();
}
@@ -158,14 +165,14 @@
file.transferTo(dest);
}
//文件新增
- String address= "localhost:80/"+fileName;
+ String address = "localhost:80/" + fileName;
//文件新增
Wj wj = new Wj();
wj.setJid(jid);
wj.setAddress(address);
iWjService.insertfeed(wj);
map.put("id", wj.getId());
- map.put("filePath","D:/nginx-1.12.2/images/"+fileName);
+ map.put("filePath", "D:/nginx-1.12.2/images/" + fileName);
return R.data(map);
}
@@ -177,13 +184,14 @@
String feedbackphoto, String jd, String wd, String tname, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
feedbackService.insertfeed(jid, snumber, sname, addvcd, place, result, describe, type, devicenumber, galarmpeople, phone, stime, ctime, feedbackaudio, feedbackvideo, feedbackphoto, jd, wd, tname);
return R.success("新增成功");
}
/**
* 查询
+ *
* @param response
* @return
*/
@@ -191,29 +199,30 @@
public R selectFeedList(HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
return R.data(feedbackService.selectFeedList());
}
/**
* 删除
+ *
* @return
*/
@PostMapping("/deletefeed")
public R deletefeed(String Path, String id, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
- try{
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ try {
File file = new File(Path);
- if(file.delete()){
+ if (file.delete()) {
iWjService.del(id);
System.out.println(file.getName() + " 文件已被删除！");
- }else{
+ } else {
System.out.println("文件删除失败！");
}
- }catch(Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
return R.success("删除成功");
@@ -221,22 +230,88 @@
/**
* APP警情反馈信息
+ *
* @param response
* @return
*/
@PostMapping("/selectFeedEdit")
- public R selectFeedEdit(HttpServletResponse response,String jid) {
+ public R selectFeedEdit(HttpServletResponse response, String jid) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ 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);
- maps.put("List",feedbackVOS);
- maps.put("wj",map);
+ 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) {
+
+ SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
+ sdf.applyPattern("yyyy-MM-dd HH:mm:ss");// a为am/pm的标记
+ Date date = new Date();// 获取当前时间
+ //System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）
+
+ Operation operation = new Operation();
+ operation.setJid(feedback.getJid());
+ operation.setSnumber(feedback.getSnumber());
+ operation.setZc("任务反馈提交,警情结束");
+ operation.setSname(feedback.getSname());
+
+ operation.setZctime(sdf.format(date));
+ operationService.save(operation);
+
+ feedbackService.save(feedback);
+ Wj wj = new Wj();
+ if (feedback.getSpaddress().equals("")&&feedback.getSpaddress().equals(null)) {
+
+ } else {
+ //获取视频地址
+ String[] splitsp = feedback.getSpaddress().split(",");//以逗号分割
+ for (String string2 : splitsp) {
+ wj.setJid(feedback.getJid());
+ wj.setAddress(string2);
+ iWjService.insertfeed(wj);
+ }
+ }
+ if (feedback.getTpaddress().equals("")&&feedback.getTpaddress().equals(null)){
+
+ }
+ else {
+ String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
+ for (
+ String string3 : splittp) {
+ wj.setJid(feedback.getJid());
+ wj.setAddress(string3);
+ iWjService.insertfeed(wj);
+ }
+ }
+ alarmService.updateJtype(operation.getJid(), "2", null, null);
+
+ return R.success("新增成功");
+ }
}
--
Gitblit v1.9.3