From 75591d24b70c37c5325f88b0f26888056eb2f20d Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 21 三月 2023 16:02:46 +0800
Subject: [PATCH] 提交
---
src/main/java/com/example/jz/controller/ReportController.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java
index f3ec50d..885cf77 100644
--- a/src/main/java/com/example/jz/controller/ReportController.java
+++ b/src/main/java/com/example/jz/controller/ReportController.java
@@ -14,6 +14,7 @@
import com.example.jz.modle.entity.Report;
import com.example.jz.modle.entity.User;
import com.example.jz.modle.vo.ReportListVo;
+import com.example.jz.modle.vo.ReportVXVO;
import com.example.jz.service.GroupUserService;
import com.example.jz.service.MessageService;
import com.example.jz.service.ReportService;
@@ -30,6 +31,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.Serializable;
+import java.util.Map;
/**
* 鎶ユ琛�(Report)琛ㄦ帶鍒跺眰
@@ -78,6 +80,13 @@
return R.ok(reportService.getReportListVoById(id));
}
+ @GetMapping("/rejectReport/{id}")
+ @ApiOperation(value = "淇敼椹冲洖鍚庢帴鍙�")
+ public R<ReportVXVO> getOne(@PathVariable Integer id){
+ ReportVXVO res = reportService.getRejectReportById(id);
+ return R.ok(res);
+ }
+
/**
* 鎶ユ
*
@@ -102,13 +111,26 @@
return R.ok(reportService.audit(report));
}
+ @PostMapping("/reject")
+ @ApiOperation(value = "椹冲洖")
+ public R<Boolean> reject(@RequestBody Map map) {
+ return R.ok(reportService.reject((Integer) map.get("id"), (String) map.get("reason")));
+ }
+
@ApiOperation(httpMethod = "PUT", value = "妗堜欢鍙�-鎶ユ浜哄憳-缂栬緫")
@PutMapping("/updateReport")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
@Transactional(rollbackFor = Exception.class)
public R updateReport(@RequestBody AddReportDto report) {
+ Integer causeId = report.getCauseId();
+ if(causeId==null){
+ return R.failed("鍏宠仈妗堜欢涓嶈兘涓虹┖");
+ }
int imgIndexFirst = report.getPic().indexOf("/img");
- int imgIndexEnd = report.getPic().indexOf("?");
+ int imgIndexEnd = report.getPic().length();
+ if(report.getPic().indexOf("?") != -1){
+ imgIndexEnd = report.getPic().indexOf("?");
+ }
String pic = report.getPic().substring(imgIndexFirst + 5, imgIndexEnd);
report.setPic(pic);
reportService.updateById(report);
@@ -150,11 +172,11 @@
return R.ok();
}
- @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-鎶ユ浜哄憳-鎶ユ鏉愭枡瀵煎嚭")
- @PostMapping("/exportReporter")
- @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
- public void exportReport(@RequestParam(value = "id") Integer id, HttpServletResponse response) {
- reportService.exportReporter(id, response);
- }
+// @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-鎶ユ浜哄憳-鎶ユ鏉愭枡瀵煎嚭")
+// @PostMapping("/exportReporter")
+// @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+// public void exportReport(@RequestParam(value = "id") Integer id, HttpServletResponse response) {
+// reportService.exportReporter(id, response);
+// }
}
--
Gitblit v1.8.0