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/AnnouncementController.java |   90 +++++++++++++++++++-------------------------
 1 files changed, 39 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/example/jz/controller/AnnouncementController.java b/src/main/java/com/example/jz/controller/AnnouncementController.java
index 1a91dbb..8321be2 100644
--- a/src/main/java/com/example/jz/controller/AnnouncementController.java
+++ b/src/main/java/com/example/jz/controller/AnnouncementController.java
@@ -1,16 +1,15 @@
 package com.example.jz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.api.ApiController;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.jz.modle.entity.Announcement;
 import com.example.jz.modle.R;
+import com.example.jz.modle.entity.Announcement;
 import com.example.jz.service.AnnouncementService;
+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.List;
 
 /**
  * 鍏憡琛�(Announcement)琛ㄦ帶鍒跺眰
@@ -20,6 +19,7 @@
  */
 @RestController
 @RequestMapping("announcement")
+@Api(tags = "缇ゅ叕鍛�")
 public class AnnouncementController extends ApiController {
     /**
      * 鏈嶅姟瀵硅薄
@@ -27,59 +27,47 @@
     @Resource
     private AnnouncementService announcementService;
 
-    /**
-     * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
-     *
-     * @param page         鍒嗛〉瀵硅薄
-     * @param announcement 鏌ヨ瀹炰綋
-     * @return 鎵�鏈夋暟鎹�
-     */
-    @GetMapping
-    public R<Page<Announcement>> selectAll(Page<Announcement> page, Announcement announcement) {
-        return R.ok(this.announcementService.page(page, new QueryWrapper<>(announcement)));
+    @ApiOperation(httpMethod = "GET", value = "缇ゅ叕鍛婃煡璇�")
+    @GetMapping("/getAnnouncements")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R getAnnouncements(@RequestParam(value = "size") Integer size,
+                              @RequestParam(value = "current") Integer current,
+                              @RequestParam(value = "groupId") Integer groupId,
+                              @RequestParam(value = "content", required = false) String content,
+                              @RequestParam(value = "status", required = false) Integer status) {
+        return R.ok(announcementService.getAnnouncements(size, current, content, status, groupId));
     }
 
-    /**
-     * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁
-     *
-     * @param id 涓婚敭
-     * @return 鍗曟潯鏁版嵁
-     */
-    @GetMapping("{id}")
-    public R selectOne(@PathVariable Serializable id) {
-        return R.ok(this.announcementService.getById(id));
+    @ApiOperation(httpMethod = "GET", value = "缇ゅ叕鍛婇�氳繃id鏌ヨ")
+    @GetMapping("/getAnnouncementsById")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R getAnnouncements(@RequestParam(value = "id") Integer id) {
+        return R.ok(announcementService.getAnnouncementsById(id));
     }
 
-    /**
-     * 鏂板鏁版嵁
-     *
-     * @param announcement 瀹炰綋瀵硅薄
-     * @return 鏂板缁撴灉
-     */
-    @PostMapping
-    public R insert(@RequestBody Announcement announcement) {
-        return R.ok(this.announcementService.save(announcement));
+    @ApiOperation(httpMethod = "POST", value = "缇ゅ叕鍛婃坊鍔�")
+    @PostMapping("/add")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R insert(@RequestParam(value = "groupId") Integer groupId, @RequestBody Announcement announcement) {
+        return R.ok(announcementService.add(groupId, announcement));
     }
 
-    /**
-     * 淇敼鏁版嵁
-     *
-     * @param announcement 瀹炰綋瀵硅薄
-     * @return 淇敼缁撴灉
-     */
-    @PutMapping
-    public R update(@RequestBody Announcement announcement) {
-        return R.ok(this.announcementService.updateById(announcement));
+    @ApiOperation(httpMethod = "PUT", value = "缇ゅ叕鍛婂彂甯�/涓嬫灦")
+    @PutMapping("/publicOrUnshelve")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R updateStatusPublic(@RequestParam(value = "id") Integer id,
+                                @RequestParam(value = "status")Integer status) {
+        announcementService.updateStatus(id,status);
+        return R.ok();
     }
 
-    /**
-     * 鍒犻櫎鏁版嵁
-     *
-     * @param idList 涓婚敭缁撳悎
-     * @return 鍒犻櫎缁撴灉
-     */
-    @DeleteMapping
-    public R delete(@RequestParam("idList") List<Long> idList) {
-        return R.ok(this.announcementService.removeByIds(idList));
+
+
+    @ApiOperation(httpMethod = "DELETE", value = "缇ゅ叕鍛婂垹闄�")
+    @DeleteMapping("/delete")
+    @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+    public R delete(@RequestParam(value = "id") Integer id) {
+        announcementService.removeById(id);
+        return R.ok();
     }
 }

--
Gitblit v1.8.0