From 1c3f11dfd7493a4c4a8d41e2499477840bcc070c Mon Sep 17 00:00:00 2001 From: baizonghao <1719256278@qq.com> Date: 星期五, 19 五月 2023 15:01:46 +0800 Subject: [PATCH] 限制文件大小,用户,报案人审核筛选 --- src/main/java/com/example/jz/controller/ReportController.java | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 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..46f65f9 100644 --- a/src/main/java/com/example/jz/controller/ReportController.java +++ b/src/main/java/com/example/jz/controller/ReportController.java @@ -13,7 +13,9 @@ import com.example.jz.modle.entity.Message; import com.example.jz.modle.entity.Report; import com.example.jz.modle.entity.User; +import com.example.jz.modle.vo.NewCauseVo; 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 +32,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.Serializable; +import java.util.Map; /** * 鎶ユ琛�(Report)琛ㄦ帶鍒跺眰 @@ -78,6 +81,20 @@ 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); + } + + @GetMapping("/rejectCauseList") + public R<NewCauseVo> rejectCauseList(@RequestParam Integer id){ + NewCauseVo res = reportService.rejectCauseList(id); + return R.ok(res); + } + + /** * 鎶ユ * @@ -102,13 +119,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 +180,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