From a5a0ff50ea4be9a7e7d0c6f805ed26809e3b183e Mon Sep 17 00:00:00 2001 From: shiyue <1211061228@qq.com> Date: 星期四, 16 二月 2023 12:48:42 +0800 Subject: [PATCH] 2023-02-16更新 --- src/main/java/com/example/jz/controller/CauseController.java | 82 +++++++++++++++++++++++++++++------------ 1 files changed, 58 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/example/jz/controller/CauseController.java b/src/main/java/com/example/jz/controller/CauseController.java index fbe2d62..90bfc38 100644 --- a/src/main/java/com/example/jz/controller/CauseController.java +++ b/src/main/java/com/example/jz/controller/CauseController.java @@ -1,6 +1,8 @@ package com.example.jz.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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; @@ -8,16 +10,21 @@ import com.example.jz.modle.dto.AddReportDto; import com.example.jz.modle.dto.CauseDto; import com.example.jz.modle.dto.ReportParamDto; -import com.example.jz.modle.entity.Report; +import com.example.jz.modle.entity.Cause; import com.example.jz.modle.vo.ReportListVo; import com.example.jz.service.CauseService; import com.example.jz.service.ReportService; -import com.example.jz.service.UserService; 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.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.util.List; /** * 妗堜欢琛�(Cause)琛ㄦ帶鍒跺眰 @@ -27,11 +34,12 @@ */ @RestController @RequestMapping("cause") -@Api(tags = "妗堜欢鍖�") +@Api(tags = "妗堜欢鍖�-妗堜欢褰曞叆") public class CauseController extends ApiController { /** * 鏈嶅姟瀵硅薄 */ + @Resource private CauseService causeService; private ReportService reportService; @@ -46,51 +54,61 @@ } - @ApiOperation(httpMethod = "POST", value = "娣诲姞妗堜欢") + @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-妗堜欢褰曞叆-娣诲姞妗堜欢") @PostMapping("/addCause") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) - public R addCause(@RequestBody CauseDto causeDto) { + public R addCause(@RequestBody @Validated CauseDto causeDto) { + int count = causeService.count(new LambdaQueryWrapper<Cause>().eq(Cause::getName, causeDto.getName())); + if(count>0){ + return R.failed("璇ユ浠跺悕宸插瓨鍦�,璇烽噸鏂拌緭鍏�"); + } causeService.addCause(causeDto); return R.ok(); } - @ApiOperation(httpMethod = "PUT", value = "淇敼妗堜欢") + @ApiOperation(httpMethod = "PUT", value = "妗堜欢鍙�-妗堜欢褰曞叆-淇敼妗堜欢") @PutMapping("/updateCause") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) - public R updateCause(@RequestBody CauseDto causeDto, Integer id) { + public R updateCause(@RequestBody @Validated CauseDto causeDto, Integer id) { return R.ok(causeService.updateCause(causeDto, id)); } - @ApiOperation(httpMethod = "GET", value = "妗堜欢褰曞叆鍒楄〃") + @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-妗堜欢褰曞叆鍒楄〃") @GetMapping("/getCauseList") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) public R getCauseList(String cause, Integer status, Integer size, Integer current) { return R.ok(causeService.getCauserListByCondition(cause, status, size, current)); } - @ApiOperation(httpMethod = "GET", value = "璐熻矗浜烘煡璇�") + @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-妗堜欢褰曞叆鍒楄〃") + @GetMapping("/getCause") + @ApiResponse(message = "鎵ц鎴愬姛", code = 200) + public R getCause(String cause, Integer status, Integer size, Integer current,Integer id) { + return R.ok(causeService.getCauserListByCondition(cause, status, size, current,id)); + } + @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-璐熻矗浜烘煡璇�") @GetMapping("/getManagerList") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) public R getManagerList() { return R.ok(causeService.getManagerList()); } - @ApiOperation(httpMethod = "GET", value = "鑾峰彇鎶ユ浜哄憳") + @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-鑾峰彇妗堜欢鎶ユ浜哄憳") @GetMapping("/getReporterList") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) public R getReporterList(Integer causeId) { return R.ok(causeService.getReporterList(causeId)); } - @ApiOperation(httpMethod = "GET", value = "鑾峰彇妗堜欢缇ゅ叕鍛�") + @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-鑾峰彇妗堜欢缇ゅ叕鍛�") @GetMapping("/getGroupAnnouncement") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) public R getGroupAnnouncement(Integer groupId) { return R.ok(causeService.getGroupAnnouncement(groupId)); } - @ApiOperation(httpMethod = "DELETE", value = "妗堜欢鍒犻櫎") + @ApiOperation(httpMethod = "DELETE", value = "妗堜欢鍙�-妗堜欢褰曞叆-妗堜欢鍒犻櫎") @DeleteMapping("/deleteCause") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) public R deleteCause(@RequestParam(value = "id") Integer id) { @@ -98,27 +116,43 @@ return R.ok(); } + @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-妗堜欢褰曞叆-妗堜欢瀵煎叆") + @PostMapping("/upload") + @ApiResponse(message = "鎵ц鎴愬姛", code = 200) + @SneakyThrows + public R upload(@RequestParam(value = "multipartFile") MultipartFile multipartFile) { + causeService.loadFile(multipartFile); + return R.ok(); + } + + @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-妗堜欢褰曞叆-鎶ユ浜哄憳-鎶ユ浜哄厓瀵煎叆") + @PostMapping("/reporterUpload") + @ApiResponse(message = "鎵ц鎴愬姛", code = 200) + @SneakyThrows + public R uploadReporter(@RequestParam(value = "multipartFile") MultipartFile multipartFile,Integer causeId) { + causeService.loadFileReport(multipartFile,causeId); + return R.ok(); + } + @ApiOperation(httpMethod = "GET", value = "鏍规嵁缇ょ粍id鏌ヨ妗堜欢鍒嗛〉") @GetMapping("/getAllReportList") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) - public R<IPage<ReportListVo>> get(Page<ReportListVo> page, ReportParamDto reportParamDto, Integer groupId) { - return R.ok(reportService.getPageByGroupId(page, reportParamDto, groupId)); + public R<IPage<ReportListVo>> get(Page<ReportListVo> page, ReportParamDto reportParamDto, Integer causeId) { + return R.ok(reportService.getPageByGroupId(page, reportParamDto, causeId)); } @ApiOperation(httpMethod = "POST", value = "娣诲姞浜哄憳") @PostMapping("/addReporter") @ApiResponse(message = "鎵ц鎴愬姛", code = 200) - public R<Boolean> get(AddReportDto addReportDto) { - if (addReportDto.getReporterName() == null || addReportDto.getReporterName().equals("")) { - return R.failed("鎶ユ浜哄憳涓嶈兘涓虹┖"); - } - if (addReportDto.getMobile() == null || addReportDto.getMobile().equals("")) { - return R.failed("鎶ユ浜哄憳鐢佃瘽涓嶈兘涓虹┖"); - } - if (addReportDto.getIdcard() == null || addReportDto.getIdcard().equals("")) { - return R.failed("鎶ユ浜哄憳韬唤璇佷笉鑳戒负绌�"); - } + public R<Boolean> get(@RequestBody AddReportDto addReportDto) { return R.ok(causeService.addReportPeople(addReportDto)); } + + @ApiOperation(httpMethod = "GET", value = "鑾峰彇妗堜欢鐨刬d鍜屽悕绉板垪琛�") + @GetMapping("/getCauseIdAndName") + @ApiResponse(message = "鎵ц鎴愬姛", code = 200) + public R getCauseIdAndName() { + return R.ok(causeService.getCauseIdAndName()); + } } -- Gitblit v1.8.0