From 3058f3d94dc3dbfdbf1d69c4b5143f95d674827d Mon Sep 17 00:00:00 2001
From: 安瑾然 <107107765@qq.com>
Date: 星期二, 19 七月 2022 13:36:26 +0800
Subject: [PATCH] commit
---
src/main/java/com/example/jz/controller/ReportController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 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 cfed973..f2cc3f0 100644
--- a/src/main/java/com/example/jz/controller/ReportController.java
+++ b/src/main/java/com/example/jz/controller/ReportController.java
@@ -1,20 +1,21 @@
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.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 java.io.Serializable;
import java.util.Date;
-import java.util.List;
/**
* 鎶ユ琛�(Report)琛ㄦ帶鍒跺眰
@@ -36,13 +37,13 @@
* 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
*
* @param page 鍒嗛〉瀵硅薄
- * @param report 鏌ヨ瀹炰綋
+ * @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,8 +54,8 @@
*/
@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));
}
/**
@@ -84,5 +85,29 @@
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();
+ }
}
--
Gitblit v1.8.0