From a5b6b004f1737bf06aaaeb8d06e40b9702de25e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Mar 2021 14:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/impl/FeedbackServiceImpl.java | 5 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/IFeedbackService.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml | 10 ++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/vo/FeedbackVO.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 15 +++++++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.java | 1 +
6 files changed, 33 insertions(+), 0 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 ce1a8f4..4d2b93c 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
@@ -41,6 +41,7 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -221,4 +222,18 @@
return R.success("删除成功");
}
+ /**
+ * APP警情反馈信息
+ * @param response
+ * @return
+ */
+ @PostMapping("/selectFeedEdit")
+ 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");
+ List<FeedbackVO> feedbackVOS = feedbackService.selectFeedEdit(jid);
+ return R.data(feedbackVOS);
+ }
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.java
index 32c7137..22722bc 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.java
@@ -40,6 +40,7 @@
*/
List<FeedbackVO> selectFeedbackPage(IPage page, FeedbackVO feedback);
List<FeedbackVO> selectFeedList();
+ List<FeedbackVO> selectFeedEdit(String jid);
void insertfeed(String jid, String snumber, String sname, String addvcd, String place, String result, String describe, String type, String devicenumber, String galarmpeople, String phone, String stime,
String ctime, String feedbackaudio, String feedbackvideo, String feedbackphoto, String jd, String wd, String tname);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml
index 3b27c62..41b52c1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml
@@ -57,4 +57,14 @@
<select id="selectFeedList" resultMap="feedbackResultMaps">
select f.*,d.addvnm from sys_feedback f left join sys_district d on d.addvcd=f.addvcd
</select>
+
+ <!--App警情反馈信息-->
+ <select id="selectFeedEdit" resultMap="feedbackResultMaps">
+ SELECT
+ f.*,
+ w.address
+ FROM
+ sys_feedback f
+ LEFT JOIN sys_wj w ON w.jid = f.jid WHERE f.jid=#{jid}
+ </select>
</mapper>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/IFeedbackService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/IFeedbackService.java
index 5f6de72..feb13b1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/IFeedbackService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/IFeedbackService.java
@@ -42,4 +42,5 @@
void insertfeed(String jid, String snumber, String sname, String addvcd, String place, String result, String describe, String type, String devicenumber, String galarmpeople, String phone, String stime,
String ctime, String feedbackaudio, String feedbackvideo, String feedbackphoto, String jd, String wd, String tname);
List<FeedbackVO> selectFeedList();
+ List<FeedbackVO> selectFeedEdit(String jid);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/impl/FeedbackServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/impl/FeedbackServiceImpl.java
index 3e6dbd4..08bceef 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/impl/FeedbackServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/impl/FeedbackServiceImpl.java
@@ -51,5 +51,10 @@
return baseMapper.selectFeedList();
}
+ @Override
+ public List<FeedbackVO> selectFeedEdit(String jid) {
+ return baseMapper.selectFeedEdit(jid);
+ }
+
}
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 7c15b2d..51bad91 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
@@ -34,5 +34,6 @@
private static final long serialVersionUID = 1L;
private String addvnm;
+ private String address;
}
--
Gitblit v1.9.3