liujc преди 2 години
родител
ревизия
30cead0a05

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

@@ -46,4 +46,12 @@ public interface ImGroupDao extends BaseDAO<String, ImGroup> {
     ImGroup queryBySchoolId(@Param("schoolId") Long schoolId);
     ImGroup queryBySchoolId(@Param("schoolId") Long schoolId);
 
 
     List<ImGroup> getByIds(@Param("musicGroupIds") List<String> musicGroupIds);
     List<ImGroup> getByIds(@Param("musicGroupIds") List<String> musicGroupIds);
+
+    /**
+     * 批量添加群成员数量
+     *
+     * @param imGroupIds
+     * @param i
+     */
+    void addMemberNum(@Param("imGroupIds") List<String> imGroupIds, @Param("num") int i);
 }
 }

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SchoolActivityWrapper.java

@@ -182,7 +182,7 @@ public class SchoolActivityWrapper {
 
 
         @ApiModelProperty("学生列表")
         @ApiModelProperty("学生列表")
         @NotEmpty(message = "学生列表不能为空")
         @NotEmpty(message = "学生列表不能为空")
-        private List<SchoolActivityStudent> studnetList;
+        private List<SchoolActivityStudent> studentList;
 
 
     }
     }
 
 

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

@@ -284,16 +284,22 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         ImPluginService imPluginService =imPluginContext.getPluginService(serviceProvider);
         ImPluginService imPluginService =imPluginContext.getPluginService(serviceProvider);
 
 
         List<ImGroupMember> imGroupMembers = imGroupMemberDao.queryMembersByUserId(userId);
         List<ImGroupMember> imGroupMembers = imGroupMemberDao.queryMembersByUserId(userId);
-        if (CollectionUtils.isNotEmpty(imGroupMembers)) {
-            for (ImGroupMember imGroupMember : imGroupMembers) {
-                try {
-                    imPluginService.groupQuit(imGroupMember.getImGroupId(), ImGroupMemberWrapper.ImGroupMember.builder().userId(userId).build());
-                } catch (Exception e) {
-                    log.error("用户退出群失败{},{}", userId, imGroupMember.getImGroupId(), e);
-                }
+
+        if (CollectionUtils.isEmpty(imGroupMembers)) {
+            return;
+        }
+        for (ImGroupMember imGroupMember : imGroupMembers) {
+            try {
+                imPluginService.groupQuit(imGroupMember.getImGroupId(), ImGroupMemberWrapper.ImGroupMember.builder().userId(userId).build());
+            } catch (Exception e) {
+                log.error("用户退出群失败{},{}", userId, imGroupMember.getImGroupId(), e);
             }
             }
         }
         }
         imGroupMemberDao.deleteByUserId(userId);
         imGroupMemberDao.deleteByUserId(userId);
+        // 更新群组人员数
+        imGroupDao.addMemberNum(imGroupMembers.stream().map(ImGroupMember::getImGroupId).collect(Collectors.toList()),-1);
+
+         // TODO 群组没人,删除群组
     }
     }
 
 
     /**
     /**
@@ -301,7 +307,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      *
      *
      * @param schoolId 学校id
      * @param schoolId 学校id
      * @param userId   用户id
      * @param userId   用户id
-     * @param leader   是否是群主
+     * @param schoolStaffType   是否是群主
      */
      */
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)

+ 3 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SchoolActivityDetailUserServiceImpl.java

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ym.mec.biz.dal.entity.SchoolActivity;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.mapper.SchoolActivityMapper;
 import com.ym.mec.biz.dal.mapper.SchoolActivityMapper;
@@ -104,10 +103,10 @@ public class SchoolActivityDetailUserServiceImpl extends ServiceImpl<SchoolActiv
                 .remove();
                 .remove();
 
 
         List<SchoolActivityDetailUser> schoolActivityDetailUsers = studentList.stream().flatMap(schoolActivitySubject -> {
         List<SchoolActivityDetailUser> schoolActivityDetailUsers = studentList.stream().flatMap(schoolActivitySubject -> {
-            if (CollectionUtils.isEmpty(schoolActivitySubject.getStudnetList())) {
+            if (CollectionUtils.isEmpty(schoolActivitySubject.getStudentList())) {
                 return Stream.empty();
                 return Stream.empty();
             }
             }
-            return schoolActivitySubject.getStudnetList().stream().map(o -> {
+            return schoolActivitySubject.getStudentList().stream().map(o -> {
                 SchoolActivityDetailUser schoolActivityDetailUser = new SchoolActivityDetailUser();
                 SchoolActivityDetailUser schoolActivityDetailUser = new SchoolActivityDetailUser();
                 schoolActivityDetailUser.setSchoolActivityDetailId(schoolActivityDetailId);
                 schoolActivityDetailUser.setSchoolActivityDetailId(schoolActivityDetailId);
                 schoolActivityDetailUser.setStudentId(o.getStudentId());
                 schoolActivityDetailUser.setStudentId(o.getStudentId());
@@ -196,7 +195,7 @@ public class SchoolActivityDetailUserServiceImpl extends ServiceImpl<SchoolActiv
             schoolActivitySubject.setSubjectId(k);
             schoolActivitySubject.setSubjectId(k);
             schoolActivitySubject.setSubjectName(v.get(0).getSubjectName());
             schoolActivitySubject.setSubjectName(v.get(0).getSubjectName());
             schoolActivitySubject.setStudentCount(v.size());
             schoolActivitySubject.setStudentCount(v.size());
-            schoolActivitySubject.setStudnetList(v);
+            schoolActivitySubject.setStudentList(v);
             schoolActivitySubjects.add(schoolActivitySubject);
             schoolActivitySubjects.add(schoolActivitySubject);
         });
         });
 
 

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

@@ -249,4 +249,11 @@
             #{item}
             #{item}
         </foreach>
         </foreach>
     </select>
     </select>
+
+	<update id="addMemberNum">
+        update im_group set member_num_ = member_num_ + #{num} where id_  in
+        <foreach collection="imGroupIds" close=")" item="item" open="(" separator=",">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
 </mapper>