From 7ea5eece501c98a91555a5358931367e78e9d23b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 25 五月 2023 15:40:09 +0800
Subject: [PATCH] 11

---
 src/main/java/com/example/jz/controller/ReportController.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java
index aa13342..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;
@@ -21,13 +23,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * 鎶ユ琛�(Report)琛ㄦ帶鍒跺眰
@@ -76,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);
+    }
+
+
     /**
      * 鎶ユ
      *
@@ -100,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);
@@ -139,11 +171,20 @@
         return R.ok();
     }
 
-    @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-鎶ユ浜哄憳-鎶ユ鏉愭枡瀵煎嚭")
-    @PostMapping("/exportReporter")
+    @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-妗堜欢褰曞叆-鎶ユ浜哄憳-鎶ユ浜哄厓瀵煎叆")
+    @PostMapping("/reporterUpload")
     @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
-    public void exportReport(@RequestParam(value = "id") Integer id, HttpServletResponse response) {
-        reportService.exportReporter(id, response);
+    @SneakyThrows
+    public R uploadReporter(@RequestParam(value = "multipartFile") MultipartFile multipartFile, Integer causeId) {
+        reportService.loadFileReport(multipartFile,causeId);
+        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);
+//    }
 }
 

--
Gitblit v1.8.0