zouxuan 3 年之前
父節點
當前提交
7277dd3acc

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImGroupMember.java

@@ -58,9 +58,10 @@ public class ImGroupMember implements Serializable {
     public ImGroupMember() {
     }
 
-    public ImGroupMember(Long groupId, Long userId, String nickname, Boolean isAdmin, ImGroupMemberRoleType roleType) {
+    public ImGroupMember(Long groupId, Long userId, String nickname, String avatar, Boolean isAdmin, ImGroupMemberRoleType roleType) {
         this.groupId = groupId;
         this.userId = userId;
+        this.avatar = avatar;
         this.nickname = nickname;
         this.isAdmin = isAdmin;
         this.roleType = roleType;

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupMemberServiceImpl.java

@@ -64,7 +64,7 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
         //记录群成员
         BasicUserInfo basicUserInfo = teacherDao.getBasicUserInfo(userId);
         String username = roleType== ImGroupMember.ImGroupMemberRoleType.TEACHER?basicUserInfo.getRealName():basicUserInfo.getUsername();
-        ImGroupMember imGroupMember = new ImGroupMember(imGroupId, userId, username, isAdmin, roleType);
+        ImGroupMember imGroupMember = new ImGroupMember(imGroupId, userId,basicUserInfo.getAvatar(), username, isAdmin, roleType);
         Date date = new Date();
         imGroupMember.setCreateTime(date);
         imGroupMember.setUpdateTime(date);

+ 2 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMemberMapper.xml

@@ -56,6 +56,7 @@
         <result property="userId" column="user_id_"/>
         <result property="isAdmin" column="is_admin_"/>
         <result property="nickname" column="nick_name_"/>
+        <result property="avatar" column="avatar_"/>
         <result property="roleType" column="role_type_"/>
         <result property="createTime" column="now_"/>
         <result property="updateTime" column="now_"/>
@@ -63,7 +64,7 @@
     <select id="initImGroupMember" resultMap="ImGroupMember">
         SELECT #{imGroupId} group_id_,su.id_ user_id_, 0 is_admin_,
                CASE WHEN #{roleType} = 'STUDENT' THEN su.username_ ELSE su.real_name_ END nick_name_,
-               #{roleType} role_type_,NOW() now_
+               #{roleType} role_type_,NOW() now_,su.avatar_
         FROM sys_user su
         WHERE su.id_ IN
         <foreach collection="userIds" open="(" close=")" item="userId" separator=",">

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

@@ -1,7 +1,10 @@
 package com.yonge.cooleshow.student.controller;
 
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
+import com.yonge.cooleshow.biz.dal.entity.ImUserFriend;
 import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -16,6 +19,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;
 
@@ -47,5 +51,23 @@ 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 = "/queryPage")
+    public HttpResponseResult<List<ImGroupMember>> queryPage(@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);
+    }
 }