From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改

---
 src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java |   83 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 78 insertions(+), 5 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 90c9472..e9b8338 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);
+	}
+
 	/**
 	 * 分页
 	 */
@@ -270,6 +297,8 @@
 	 */
 	@PostMapping("/saves")
 	public R saves(FeedbackVO feedback) {
+		//插入数据,并返回id
+		Integer id = feedbackService.insert(feedback);
 
 		if (feedback.getStatus()==0) {
 			SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
@@ -315,27 +344,71 @@
 
 		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) {
+				for (String string3 : splittp) {
 					wj.setSnumber(feedback.getSnumber());
 					wj.setAddress(string3);
+					wj.setSid(id);
+					wj.setType(1);
 					iWjService.insertfeed(wj);
 				}
 			}
 		}
 
-		feedbackService.save(feedback);
+		return R.success("新增成功");
+	}
+
+	/**
+	 * 取证上报修改
+	 * @param feedback 取证对象
+	 */
+	@PostMapping("/updates")
+	public R updates(FeedbackVO feedback) {
+
+		//修改数据,并返回id
+		feedbackService.updateById(feedback);
+		if (feedback.getStatus()==1){
+			Wj wj = new Wj();
+			if (feedback.getSpaddress().length()>0) {
+				//先删除原有的数据
+				iWjService.deleteBySid(feedback.getId());
+				//获取视频地址
+				String[] splitsp = feedback.getSpaddress().split(",");//以逗号分割
+				for (String string2 : splitsp) {
+					wj.setSnumber(feedback.getSnumber());
+					wj.setAddress(string2);
+					wj.setSid(feedback.getId());
+					wj.setType(2);
+					iWjService.insertfeed(wj);
+				}
+			}
+			if (feedback.getTpaddress().length()>0) {
+				//先删除原有的数据
+				iWjService.deleteBySid(feedback.getId());
+				//图片
+				String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
+				for (String string3 : splittp) {
+					wj.setSnumber(feedback.getSnumber());
+					wj.setAddress(string3);
+					wj.setSid(feedback.getId());
+					wj.setType(1);
+					iWjService.insertfeed(wj);
+				}
+			}
+		}
 
 		return R.success("新增成功");
 	}

--
Gitblit v1.9.3