From b3e1084ddebf92b2858706aca5ea7841942216fc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 23 Jun 2021 14:25:22 +0800
Subject: [PATCH] 取证详情接口修改，新增接口修改
---
src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
index fe36014..993de0b 100644
--- a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
+++ b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
@@ -74,6 +74,33 @@
return R.data(FeedbackWrapper.build().entityVO(detail));
}
+
+ /**
+ * 取证上报详情
+ * @param feedback 取证上报对象，必须含Id
+ */
+ @GetMapping("/details")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入feedback")
+ public R details(Feedback feedback) {
+ Map<Object, Object> map = new HashMap<>(3);
+ Wj wj = new Wj();
+ if (null==feedback.getId()){
+ return R.data(false);
+ }
+ wj.setSid(feedback.getId());
+ //查询基本信息
+ map.put("feedback",feedbackService.getFeedbackById(feedback.getId()));
+ //获取图片
+ wj.setType(1);
+ map.put("images",iWjService.selectResouces(wj));
+ //获取视频
+ wj.setType(2);
+ map.put("videos",iWjService.selectResouces(wj));
+ //返回数据
+ return R.data(map);
+ }
+
/**
* 分页
*/
@@ -319,22 +346,25 @@
if (feedback.getStatus()==1){
Wj wj = new Wj();
- if (feedback.getSpaddress() != null && feedback.getSpaddress()!="") {
+ if (feedback.getSpaddress().length()>0) {
//获取视频地址
String[] splitsp = feedback.getSpaddress().split(",");//以逗号分割
for (String string2 : splitsp) {
wj.setSnumber(feedback.getSnumber());
wj.setAddress(string2);
wj.setSid(id);
+ wj.setType(2);
iWjService.insertfeed(wj);
}
}
- if (feedback.getTpaddress() != null && feedback.getTpaddress()!="") {
+ if (feedback.getTpaddress().length()>0) {
+ //图片
String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
for (String string3 : splittp) {
wj.setSnumber(feedback.getSnumber());
wj.setAddress(string3);
wj.setSid(id);
+ wj.setType(1);
iWjService.insertfeed(wj);
}
}
--
Gitblit v1.9.3