群聊

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ImGroupService.java

@@ -51,6 +51,6 @@ public interface ImGroupService extends IService<ImGroup> {
     */
     void syncGroupMemberNum(Long groupId) throws Exception;
 
-    List<ImGroup> queryPage(Map<String, Object> params);
+    List<ImGroup> queryAll(Map<String, Object> params);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -172,7 +172,7 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
     }
 
     @Override
-    public List<ImGroup> queryPage(Map<String, Object> params) {
+    public List<ImGroup> queryAll(Map<String, Object> params) {
         return baseMapper.findAll(params);
     }
 }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImGroupController.java

@@ -42,12 +42,12 @@ public class ImGroupController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "search", dataType = "String", value = "根据群名称、编号、简介模糊查询"),
     })
-    @ApiOperation("分页查询")
-    @PostMapping(value = "/queryPage")
-    public HttpResponseResult<List<ImGroup>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
+    @ApiOperation("群列表")
+    @PostMapping(value = "/queryAll")
+    public HttpResponseResult<List<ImGroup>> queryAll(@RequestBody Map<String,Object> params) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         params.put("userId",sysUser.getId());
-        return succeed(imGroupService.queryPage(params));
+        return succeed(imGroupService.queryAll(params));
     }
 }
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImGroupMemberController.java

@@ -55,9 +55,9 @@ public class ImGroupMemberController extends BaseController {
             @ApiImplicitParam(name = "search", dataType = "String", value = "根据用户编号、昵称模糊查询"),
             @ApiImplicitParam(name = "groupId", dataType = "Long", value = "群编号")
     })
-    @ApiOperation("分页查询")
-    @PostMapping(value = "/queryPage")
-    public HttpResponseResult<List<ImGroupMember>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
+    @ApiOperation("获取群成员列表")
+    @PostMapping(value = "/queryAll")
+    public HttpResponseResult<List<ImGroupMember>> queryAll(@RequestBody Map<String,Object> params) throws Exception {
         if(Objects.isNull(params.get("search")) || Objects.isNull(params.get("groupId"))){
             throw new BizException("参数校验失败");
         }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImUserFriendController.java

@@ -36,9 +36,9 @@ public class ImUserFriendController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "search", dataType = "String", value = "根据用户编号、昵称模糊查询")
     })
-    @ApiOperation("分页查询")
-    @PostMapping(value = "/queryPage")
-    public HttpResponseResult<List<ImUserFriend>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
+    @ApiOperation("获取通讯录成员列表")
+    @PostMapping(value = "/queryAll")
+    public HttpResponseResult<List<ImUserFriend>> queryAll(@RequestBody Map<String,Object> params) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         List<ImUserFriend> iPage = imUserFriendService.getBaseMapper().selectList(Wrappers.<ImUserFriend>query().lambda()
                 .or(e->e.eq(ImUserFriend::getFriendId, params.get("search"))

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -61,12 +61,12 @@ public class ImGroupController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "search", dataType = "String", value = "根据群名称、编号、简介模糊查询"),
     })
-    @ApiOperation("分页查询")
-    @PostMapping(value = "/queryPage")
-    public HttpResponseResult<List<ImGroup>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
+    @ApiOperation("群列表")
+    @PostMapping(value = "/queryAll")
+    public HttpResponseResult<List<ImGroup>> queryAll(@RequestBody Map<String,Object> params) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         params.put("userId",sysUser.getId());
-        return succeed(imGroupService.queryPage(params));
+        return succeed(imGroupService.queryAll(params));
     }
 
     @ApiOperation("修改群信息")

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupMemberController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.teacher.controller;
 
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
 import com.yonge.cooleshow.biz.dal.entity.ImUserFriend;
 import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -48,5 +50,22 @@ public class ImGroupMemberController extends BaseController {
         }
         return succeed(imGroupMemberService.getUserDetail(params.get("userId"),params.get("groupId")));
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "根据用户编号、昵称模糊查询"),
+            @ApiImplicitParam(name = "groupId", dataType = "Long", value = "群编号")
+    })
+    @ApiOperation("获取群成员列表")
+    @PostMapping(value = "/queryAll")
+    public HttpResponseResult<List<ImGroupMember>> queryAll(@RequestBody Map<String,Object> params) throws Exception {
+        if(Objects.isNull(params.get("search")) || Objects.isNull(params.get("groupId"))){
+            throw new BizException("参数校验失败");
+        }
+        List<ImGroupMember> iPage = imGroupMemberService.getBaseMapper().selectList(Wrappers.<ImGroupMember>query().lambda()
+                .or(e->e.eq(ImGroupMember::getUserId, params.get("search"))
+                        .like(ImGroupMember::getNickname, params.get("search")))
+                .eq(ImGroupMember::getGroupId,params.get("groupId")).orderByDesc(ImGroupMember::getId));
+        return succeed(iPage);
+    }
 }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImUserFriendController.java

@@ -43,9 +43,9 @@ public class ImUserFriendController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "search", dataType = "String", value = "根据用户编号、昵称模糊查询")
     })
-    @ApiOperation("分页查询")
-    @PostMapping(value = "/queryPage")
-    public HttpResponseResult<List<ImUserFriend>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
+    @ApiOperation("获取通讯录成员列表")
+    @PostMapping(value = "/queryAll")
+    public HttpResponseResult<List<ImUserFriend>> queryAll(@RequestBody Map<String,Object> params) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         List<ImUserFriend> iPage = imUserFriendService.getBaseMapper().selectList(Wrappers.<ImUserFriend>query().lambda()
                 .or(e->e.eq(ImUserFriend::getFriendId, params.get("search"))