小小训练营活动

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImGroupDao.java

@@ -19,8 +19,7 @@ public interface ImGroupDao extends BaseDAO<Long, ImGroup> {
 	 * @return
 	 */
 	List<ImGroup> queryByUserId(@Param("userId") Integer userId,
-								@Param("search") String search,
-								@Param("ignoreIds") String ignoreIds);
+								@Param("search") String search);
 
 	/**
 	 * 查询群成员列表

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ImGroupQueryInfo.java

@@ -14,6 +14,16 @@ public class ImGroupQueryInfo extends QueryInfo {
 
     private String ignoreIds;
 
+    private String targetIds;
+
+    public String getTargetIds() {
+        return targetIds;
+    }
+
+    public void setTargetIds(String targetIds) {
+        this.targetIds = targetIds;
+    }
+
     public String getIgnoreIds() {
         return ignoreIds;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupService.java

@@ -35,7 +35,7 @@ public interface ImGroupService extends BaseService<Long, ImGroup> {
 	 * @param search
 	 * @return
 	 */
-	List<ImGroup> queryByUserId(Integer userId, String search,String ignoreIds);
+	List<ImGroup> queryByUserId(Integer userId, String search);
 
 	/**
 	 * 查询群成员列表

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -113,8 +113,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 	}
 
     @Override
-    public List<ImGroup> queryByUserId(Integer userId, String search, String ignoreIds) {
-		return imGroupDao.queryByUserId(userId, search,ignoreIds);
+    public List<ImGroup> queryByUserId(Integer userId, String search) {
+		return imGroupDao.queryByUserId(userId, search);
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -108,18 +108,24 @@
 	<delete id="delete" >
 		DELETE FROM im_group WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="ImGroup" parameterType="map">
-		SELECT ig.* FROM im_group_member igm
-		LEFT JOIN im_group ig ON igm.im_group_id_ = ig.id_
-		where igm.user_id_ = #{userId}
+	<sql id="queryPageSql">
+		WHERE igm.user_id_ = #{userId}
 		<if test="search != null and search != ''">
 			AND (ig.name_ like concat('%',#{search},'%') or ig.tags_ like concat('%',#{search},'%'))
 		</if>
 		<if test="ignoreIds != null and ignoreIds != ''">
 			AND NOT FIND_IN_SET(ig.id_,#{ignoreIds})
 		</if>
+		<if test="targetIds != null and targetIds != ''">
+			AND FIND_IN_SET(ig.id_,#{targetIds})
+		</if>
+	</sql>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="ImGroup" parameterType="map">
+		SELECT ig.* FROM im_group_member igm
+		LEFT JOIN im_group ig ON igm.im_group_id_ = ig.id_
+		<include refid="queryPageSql" />
 		ORDER BY id_
 		<include refid="global.limit"/>
 	</select>
@@ -128,13 +134,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(ig.id_) FROM im_group_member igm
 		LEFT JOIN im_group ig ON igm.im_group_id_ = ig.id_
-		where igm.user_id_ = #{userId}
-		<if test="search != null and search != ''">
-			AND (ig.name_ like concat('%',#{search},'%') or ig.tags_ like concat('%',#{search},'%'))
-		</if>
-		<if test="ignoreIds != null and ignoreIds != ''">
-			AND NOT FIND_IN_SET(ig.id_,#{ignoreIds})
-		</if>
+		<include refid="queryPageSql" />
 	</select>
 	
 	<select id="queryByUserId" resultMap="ImGroup" parameterType="map">
@@ -144,9 +144,6 @@
 		<if test="search != null and search != ''">
 			AND (ig.name_ like concat('%',#{search},'%') or ig.tags_ like concat('%',#{search},'%'))
 		</if>
-		<if test="ignoreIds != null and ignoreIds != ''">
-			AND NOT FIND_IN_SET(ig.id_,#{ignoreIds})
-		</if>
 	</select>
 	
 	<select id="queryMemberById" resultMap="ImGroupMemberDto">

mec-student/src/main/java/com/ym/mec/student/controller/ImGroupController.java

@@ -45,7 +45,7 @@ public class ImGroupController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,null));
+		return succeed(imGroupService.queryByUserId(sysUser.getId(), search));
 	}
 
 	@ApiOperation("查询群详情")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -48,7 +48,7 @@ public class ImGroupController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,null));
+		return succeed(imGroupService.queryByUserId(sysUser.getId(), search));
 	}
 
 	@ApiOperation("查询群详情")

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -57,7 +57,7 @@ public class ImGroupController extends BaseController {
 		if (Objects.isNull(sysUser)) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,null));
+		return succeed(imGroupService.queryByUserId(sysUser.getId(), search));
 	}
 
 	@ApiOperation("查询群详情")

mec-web/src/main/java/com/ym/mec/web/controller/ImSendGroupMessageController.java

@@ -71,4 +71,18 @@ public class ImSendGroupMessageController extends BaseController {
         }
         return succeed(imGroupService.queryPage(imGroupQueryInfo));
     }
+
+    @ApiOperation("查询群列表（在消息列表的）")
+    @PostMapping(value = "/queryGroupPage1")
+    public HttpResponseResult<PageInfo<ImGroup>> queryGroupPage1(ImGroupQueryInfo imGroupQueryInfo) throws Exception {
+        SysUser sysUser = Optional.of(sysUserFeignService.queryUserInfo()).
+                orElseThrow(() -> new Exception("请登录"));
+        imGroupQueryInfo.setUserId(sysUser.getId());
+        if(imGroupQueryInfo.getImSendGroupMessageId() != null){
+            ImSendGroupMessage imSendGroupMessage = Optional.of(imSendGroupMessageService.get(imGroupQueryInfo.getImSendGroupMessageId())).
+                    orElseThrow(()->new BizException("消息不存在"));
+            imGroupQueryInfo.setTargetIds(imSendGroupMessage.getTargetIds());
+        }
+        return succeed(imGroupService.queryPage(imGroupQueryInfo));
+    }
 }