From 8cd51fc0931fb8994f91f8e2ccf5078ef7a76ebc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 23 Jun 2021 10:25:37 +0800
Subject: [PATCH] 取证详情接口新增
---
src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java | 9 ++++
src/main/java/org/springblade/modules/wj/service/IWjService.java | 7 +++
src/main/java/org/springblade/modules/wj/mapper/WjMapper.java | 7 +++
src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml | 8 ++++
src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java | 30 +++++++++++++++
src/main/java/org/springblade/modules/wj/entity/Wj.java | 6 +++
6 files changed, 67 insertions(+), 0 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..ae1059b 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.getOne(Condition.getQueryWrapper(feedback)));
+ //获取图片
+ wj.setType(1);
+ map.put("images",iWjService.selectResouces(wj));
+ //获取视频
+ wj.setType(2);
+ map.put("videos",iWjService.selectResouces(wj));
+ //返回数据
+ return R.data(map);
+ }
+
/**
* 分页
*/
@@ -326,15 +353,18 @@
wj.setSnumber(feedback.getSnumber());
wj.setAddress(string2);
wj.setSid(id);
+ wj.setType(2);
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);
wj.setSid(id);
+ wj.setType(1);
iWjService.insertfeed(wj);
}
}
diff --git a/src/main/java/org/springblade/modules/wj/entity/Wj.java b/src/main/java/org/springblade/modules/wj/entity/Wj.java
index 73bc1cb..4f46a4b 100644
--- a/src/main/java/org/springblade/modules/wj/entity/Wj.java
+++ b/src/main/java/org/springblade/modules/wj/entity/Wj.java
@@ -60,4 +60,10 @@
private Integer sid;
+ /**
+ * 类型 1：图片 2：视频
+ */
+ private Integer type;
+
+
}
diff --git a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java
index c4e7449..e396400 100644
--- a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java
+++ b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.wj.entity.Wj;
import org.springblade.modules.wj.vo.WjVO;
@@ -46,4 +47,10 @@
void insertsurvey(Wj wj);
void del(String id);
+ /**
+ * 获取资源 图片、视频
+ * @param wj 资源对象
+ * @return
+ */
+ List<String> selectResouces(@Param("wj") Wj wj);
}
diff --git a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
index dcf03b5..f778474 100644
--- a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
+++ b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
@@ -46,4 +46,12 @@
INSERT INTO sys_wj (sid,address) VALUES (#{sid},#{address})
</insert>
+ <!--获取资源 图片、视频-->
+ <select id="selectResouces" resultType="java.lang.String">
+ select address from sys_wj
+ where 1=1
+ <if test="wj.type!=null">
+ and type = #{wj.type}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/wj/service/IWjService.java b/src/main/java/org/springblade/modules/wj/service/IWjService.java
index f5c7749..720747f 100644
--- a/src/main/java/org/springblade/modules/wj/service/IWjService.java
+++ b/src/main/java/org/springblade/modules/wj/service/IWjService.java
@@ -46,4 +46,11 @@
void inserttask(Wj wj);
void insertsurvey(Wj wj);
+
+ /**
+ * 获取资源 图片、视频
+ * @param wj
+ * @return
+ */
+ List<String> selectResouces(Wj wj);
}
diff --git a/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java b/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java
index 7b5a716..ee038ee 100644
--- a/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java
+++ b/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java
@@ -72,4 +72,13 @@
baseMapper.insertsurvey(wj);
}
+ /**
+ * 获取资源 图片、视频
+ * @param wj
+ * @return
+ */
+ @Override
+ public List<String> selectResouces(Wj wj) {
+ return baseMapper.selectResouces(wj);
+ }
}
--
Gitblit v1.9.3