From caaa6ec6ee809b1c9e56600ba1468e8f4da0103b Mon Sep 17 00:00:00 2001
From: whj <1070107765@qq.com>
Date: 星期二, 19 七月 2022 15:39:15 +0800
Subject: [PATCH] commit

---
 src/main/java/com/example/jz/controller/ReportController.java |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java
index cfed973..2734a05 100644
--- a/src/main/java/com/example/jz/controller/ReportController.java
+++ b/src/main/java/com/example/jz/controller/ReportController.java
@@ -1,20 +1,24 @@
 package com.example.jz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.jz.modle.R;
+import com.example.jz.modle.dto.AddReportDto;
+import com.example.jz.modle.dto.ReportParamDto;
 import com.example.jz.modle.entity.Report;
+import com.example.jz.modle.vo.ReportListVo;
 import com.example.jz.service.ReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 鎶ユ琛�(Report)琛ㄦ帶鍒跺眰
@@ -24,7 +28,7 @@
  */
 @RestController
 @RequestMapping("report")
-@Api(value = "鎶ユ鎺ュ彛", tags = "鎶ユ鎺ュ彛")
+@Api(value = "妗堜欢鍖�-妗堜欢浜哄憳", tags = "妗堜欢鍖�-妗堜欢浜哄憳")
 public class ReportController extends ApiController {
     /**
      * 鏈嶅姟瀵硅薄
@@ -35,14 +39,14 @@
     /**
      * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
      *
-     * @param page   鍒嗛〉瀵硅薄
-     * @param report 鏌ヨ瀹炰綋
+     * @param page           鍒嗛〉瀵硅薄
+     * @param reportParamDto 鏌ヨ瀹炰綋
      * @return 鎵�鏈夋暟鎹�
      */
     @GetMapping
     @ApiOperation(value = "鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�")
-    public R<IPage<Report>> selectAll(Page<Report> page, Report report) {
-        return R.ok(reportService.page(page, new QueryWrapper<>(report)));
+    public R<IPage<ReportListVo>> selectAll(Page<ReportListVo> page, ReportParamDto reportParamDto) {
+        return R.ok(reportService.getPage(page, reportParamDto));
     }
 
     /**
@@ -53,24 +57,21 @@
      */
     @GetMapping("{id}")
     @ApiOperation(value = "閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁")
-    public R<Report> selectOne(@PathVariable Serializable id) {
-        return R.ok(reportService.getById(id));
+    public R<ReportListVo> selectOne(@PathVariable Serializable id) {
+        return R.ok(reportService.getReportListVoById(id));
     }
 
     /**
      * 鎶ユ
      *
-     * @param report 瀹炰綋瀵硅薄
+     * @param AddReportDto 瀹炰綋瀵硅薄
      * @return 鏂板缁撴灉
      */
     @PostMapping
     @ApiOperation(value = "鎶ユ")
-    public R<Boolean> insert(@RequestBody Report report) {
-        report.setCtime(new Date());
-        report.setStatus(0);
-        //TODO 鍔ㄦ�佽幏鍙栧綋鍓嶇殑鐢ㄦ埛id
-        report.setUserId(1);
-        return R.ok(reportService.save(report));
+    public R<Boolean> insert(@RequestBody AddReportDto addReportDto) {
+
+        return R.ok(reportService.addReport(addReportDto));
     }
 
     /**
@@ -84,5 +85,36 @@
     public R<Boolean> audit(@RequestBody Report report) {
         return R.ok(reportService.audit(report));
     }
+
+    @ApiOperation(httpMethod = "PUT", value = "鎶ユ浜虹紪杈�")
+    @PutMapping("/updateReport")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R updateReport(@RequestBody Report report) {
+        reportService.updateById(report);
+        return R.ok();
+    }
+
+    @ApiOperation(httpMethod = "DELETE", value = "鎶ユ浜轰汉鍛橀��缇�")
+    @DeleteMapping("/leaveGroup")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R leaveGroup(@RequestParam(value = "id") Integer id, @RequestParam(value = "groupId") Integer groupId) {
+        reportService.leaveGroup(id, groupId);
+        return R.ok();
+    }
+
+    @ApiOperation(httpMethod = "DELETE", value = "鍒犻櫎鎶ユ浜�")
+    @DeleteMapping("/deleteReporter")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R deleteReporter(@RequestParam(value = "id") Integer id) {
+        reportService.removeById(id);
+        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