From 2e61529d8489ef46e9ee298007eb2ed57a215e3f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 21 Apr 2021 08:43:17 +0800
Subject: [PATCH] 1.反馈查询接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/impl/FeedbackServiceImpl.java | 6 ++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/IFeedbackService.java | 2 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml | 14 ++++++++++----
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 13 ++++++++-----
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.java | 2 ++
5 files changed, 28 insertions(+), 9 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..6295273 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.*;
/**
* 控制器
@@ -232,8 +229,14 @@
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>();
+ 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);
+ maps.put("List",feedbackVOS);
+ maps.put("wj",map);
+ lists.add(maps);
+ return R.data(lists);
}
}
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 22722bc..6dab464 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
@@ -22,6 +22,7 @@
import org.springblade.jfpt.feedback.vo.FeedbackVO;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -41,6 +42,7 @@
List<FeedbackVO> selectFeedbackPage(IPage page, FeedbackVO feedback);
List<FeedbackVO> selectFeedList();
List<FeedbackVO> selectFeedEdit(String jid);
+ List<Map<String, Object>> selectWjEdit(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 41b52c1..df19ba7 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
@@ -58,13 +58,19 @@
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
+ f.*
FROM
sys_feedback f
- LEFT JOIN sys_wj w ON w.jid = f.jid WHERE f.jid=#{jid}
+ WHERE f.jid=#{jid}
+ </select>
+ <!--音频，视频信息返回-->
+ <select id="selectWjEdit" resultType="java.util.HashMap">
+ SELECT
+ address
+ FROM
+ sys_wj WHERE 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 feb13b1..73dc230 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
@@ -22,6 +22,7 @@
import org.springblade.jfpt.feedback.vo.FeedbackVO;
import java.util.List;
+import java.util.Map;
/**
* 服务类
@@ -43,4 +44,5 @@
String ctime, String feedbackaudio, String feedbackvideo, String feedbackphoto, String jd, String wd, String tname);
List<FeedbackVO> selectFeedList();
List<FeedbackVO> selectFeedEdit(String jid);
+ List<Map<String, Object>> selectWjEdit(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 08bceef..b96c394 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
@@ -26,6 +26,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* 服务实现类
@@ -56,5 +57,10 @@
return baseMapper.selectFeedEdit(jid);
}
+ @Override
+ public List<Map<String, Object>> selectWjEdit(String jid) {
+ return baseMapper.selectWjEdit(jid);
+ }
+
}
--
Gitblit v1.9.3