From 5b04d19edea32888efa9ee4881395a21da348e3f Mon Sep 17 00:00:00 2001
From: 安瑾然 <107107765@qq.com>
Date: 星期四, 14 七月 2022 14:21:44 +0800
Subject: [PATCH] commit

---
 src/main/java/com/example/jz/controller/GroupController.java |   92 +++++++++++++++++++++++++---------------------
 1 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/example/jz/controller/GroupController.java b/src/main/java/com/example/jz/controller/GroupController.java
index 933a24c..41a8655 100644
--- a/src/main/java/com/example/jz/controller/GroupController.java
+++ b/src/main/java/com/example/jz/controller/GroupController.java
@@ -1,13 +1,20 @@
 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.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.jz.modle.entity.Announcement;
 import com.example.jz.modle.entity.Group;
+import com.example.jz.modle.vo.GroupMessageVo;
+import com.example.jz.modle.vo.GroupUserVo;
 import com.example.jz.service.GroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -16,73 +23,74 @@
 
 /**
  * 缇よ〃
-(Group)琛ㄦ帶鍒跺眰
+ * (Group)琛ㄦ帶鍒跺眰
  *
  * @author makejava
  * @since 2022-07-11 16:35:57
  */
 @RestController
 @RequestMapping("group")
+@Api(tags = "缇ょ粍鎺ュ彛")
 public class GroupController extends ApiController {
-    /**
-     * 鏈嶅姟瀵硅薄
-     */
-    @Resource
     private GroupService groupService;
 
+    @Autowired
+    public void setGroupService(GroupService groupService) {
+        this.groupService = groupService;
+    }
     /**
-     * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
+     * 鏍规嵁缇ょ粍id鑾峰彇褰撳墠缇ょ粍鎵�鏈夌殑娑堟伅
      *
-     * @param page 鍒嗛〉瀵硅薄
-     * @param group 鏌ヨ瀹炰綋
-     * @return 鎵�鏈夋暟鎹�
+     * @param id 缇ょ粍id
+     * @return 褰撳墠缇ょ粍鎵�鏈夌殑娑堟伅
      */
-    @GetMapping
-    public R selectAll(Page<Group> page, Group group) {
-        return success(this.groupService.page(page, new QueryWrapper<>(group)));
+    @GetMapping("getAllMessage")
+    @ApiOperation(value = "鑾峰彇褰撳墠缇ょ粍鎵�鏈夌殑娑堟伅")
+    @ApiImplicitParam(name = "id", value = "缇ょ粍id", required = true, dataType = "Integer")
+    public R<List<GroupMessageVo>> getAllMessage(@RequestParam("id") Integer id) {
+        return R.ok(groupService.getAllMessage(id));
     }
 
     /**
-     * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁
+     * 鏍规嵁缇ょ粍id鑾峰彇褰撳墠缇ょ粍鎵�鏈夊叕鍛�
      *
-     * @param id 涓婚敭
-     * @return 鍗曟潯鏁版嵁
+     * @param id 缇ょ粍id
+     * @return 褰撳墠缇ょ粍鎵�鏈夌殑娑堟伅
      */
-    @GetMapping("{id}")
-    public R selectOne(@PathVariable Serializable id) {
-        return success(this.groupService.getById(id));
+    @GetMapping("getAllNotice")
+    @ApiOperation(value = "鑾峰彇褰撳墠缇ょ粍鎵�鏈夌殑鍏憡")
+    @ApiImplicitParam(name = "id", value = "缇ょ粍id", required = true, dataType = "Integer")
+    public R<List<Announcement>> getAllNotice(@RequestParam("id") Integer id) {
+        return R.ok(groupService.getAllNotice(id));
     }
 
     /**
-     * 鏂板鏁版嵁
+     * 鍙戦�佷俊鎭�
      *
-     * @param group 瀹炰綋瀵硅薄
-     * @return 鏂板缁撴灉
+     * @param id   缇ょ粍id
+     * @param text 娑堟伅鍐呭
+     * @return 鍙戦�佺粨鏋�
      */
-    @PostMapping
-    public R insert(@RequestBody Group group) {
-        return success(this.groupService.save(group));
+    @GetMapping("sendMessage")
+    @ApiOperation(value = "鍙戦�佷俊鎭�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "text", value = "娑堟伅鏂囨湰", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "id", value = "缇ょ粍id", required = true, dataType = "Integer")
+    })
+    public R<Boolean> sendMessage(@RequestParam("id") Integer id, @RequestParam("text") String text) {
+        return R.ok(groupService.sendMessage(id, text));
     }
 
     /**
-     * 淇敼鏁版嵁
+     * 鑾峰彇缇ょ粍鎵�鏈変汉鍛樺垪琛�
      *
-     * @param group 瀹炰綋瀵硅薄
-     * @return 淇敼缁撴灉
+     * @param id 缇ょ粍id
+     * @return 缇ょ粍鎵�鏈変汉鍛樺垪琛�
      */
-    @PutMapping
-    public R update(@RequestBody Group group) {
-        return success(this.groupService.updateById(group));
-    }
-
-    /**
-     * 鍒犻櫎鏁版嵁
-     *
-     * @param idList 涓婚敭缁撳悎
-     * @return 鍒犻櫎缁撴灉
-     */
-    @DeleteMapping
-    public R delete(@RequestParam("idList") List<Long> idList) {
-        return success(this.groupService.removeByIds(idList));
+    @GetMapping("getAllUser")
+    @ApiOperation(value = "鑾峰彇缇ょ粍鎵�鏈変汉鍛樺垪琛�")
+    @ApiImplicitParam(name = "id", value = "缇ょ粍id", required = true, dataType = "Integer")
+    public R<List<GroupUserVo>> getAllUser(@RequestParam("id") Integer id) {
+        return R.ok(groupService.getAllUser(id));
     }
 }

--
Gitblit v1.8.0