From d1757c919b264de219decf4e8c9be0bf49cd926e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 19 Jun 2021 18:22:08 +0800
Subject: [PATCH] 意见反馈新增接口 saves 修改，区分是意见反馈插入还是调查反馈上报插入
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/vo/FeedbackVO.java | 5 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 97 ++++++++++++++++++++++++++++++------------------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/entity/Feedback.java | 7 +++
3 files changed, 72 insertions(+), 37 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 1221324..b37f138 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
@@ -271,46 +271,71 @@
@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小时制）
+ if (feedback.getStatus()==0) {
+ 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 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);
+ operation.setZctime(sdf.format(date));
+ operationService.save(operation);
+
+ Wj wj = new Wj();
+ if (feedback.getSpaddress().equals("") && feedback.getSpaddress() != 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() != 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);
+ }
+
+ if (feedback.getStatus()==1){
+ Wj wj = new Wj();
+ if (feedback.getSpaddress() != null && feedback.getSpaddress()!="") {
+ //获取视频地址
+ String[] splitsp = feedback.getSpaddress().split(",");//以逗号分割
+ for (String string2 : splitsp) {
+ wj.setSnumber(feedback.getSnumber());
+ wj.setAddress(string2);
+ iWjService.insertfeed(wj);
+ }
+ }
+ if (feedback.getTpaddress() != null && feedback.getTpaddress()!="") {
+ String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
+ for (
+ String string3 : splittp) {
+ wj.setSnumber(feedback.getSnumber());
+ wj.setAddress(string3);
+ iWjService.insertfeed(wj);
+ }
+ }
+ }
feedbackService.save(feedback);
- Wj wj = new Wj();
- if (feedback.getSpaddress().equals("")&&feedback.getSpaddress()!=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()!=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("新增成功");
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/entity/Feedback.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/entity/Feedback.java
index d3e9207..4719c72 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/entity/Feedback.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/entity/Feedback.java
@@ -20,12 +20,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* 实体类
@@ -107,7 +110,9 @@
*/
@ApiModelProperty(value = "事发时间")
@TableField("stime")
- private String stime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date stime;
/**
* 处理完成时间
*/
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/vo/FeedbackVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/vo/FeedbackVO.java
index 0bdd19a..252530b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/vo/FeedbackVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/vo/FeedbackVO.java
@@ -38,4 +38,9 @@
private String spaddress;
private String tpaddress;
+ /**
+ * 0 警情反馈 1 调查取证上报
+ */
+ private Integer status;
+
}
--
Gitblit v1.9.3