update

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

@@ -17,6 +17,7 @@ import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
 import com.ym.mec.biz.dal.enums.ParamEnum;
 import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
 import com.ym.mec.biz.service.EmployeeService;
+import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -27,6 +28,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -44,6 +46,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
+	private ImGroupMemberService imGroupMemberService;
+	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private TeacherDao teacherDao;
@@ -254,25 +258,23 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		if(imGroupModels.size() > 0){
 			//❤️用户加群
 			for (ImGroupModel imGroupModel : imGroupModels) {
+				Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
+				
 				List<ImGroupMember> memberList = imGroupModel.getMemberList();
-				if(memberList != null && memberList.size() > 0){
-					ImGroupMember[] imGroupMembers = new ImGroupMember[memberList.size()];
-					imGroupModel.setMembers(memberList.toArray(imGroupMembers));
+				for(ImGroupMember member : memberList){
+					userRoleMap.put(Integer.parseInt(member.getId()), "");
 				}
+				imGroupMemberService.join(Long.parseLong(imGroupModel.getId()), userRoleMap);
 			}
-		imFeignService.groupBatchJoin(imGroupModels);
 		}
 		//原有员工退群
 		List<ImGroupModel> groupModels = classGroupDao.queryTeacherQuitGroups(levelUserId);
 		if(groupModels.size() > 0){
+			List<Long> imGroupIdList = new ArrayList<Long>();
 			for (ImGroupModel imGroupModel : groupModels) {
-				List<ImGroupMember> memberList = imGroupModel.getMemberList();
-				if(memberList != null && memberList.size() > 0){
-					ImGroupMember[] imGroupMembers = new ImGroupMember[memberList.size()];
-					imGroupModel.setMembers(memberList.toArray(imGroupMembers));
-				}
+				imGroupIdList.add(Long.parseLong(imGroupModel.getId()));
 			}
-			imFeignService.groupBatchQuit(groupModels);
+			imGroupMemberService.quit(imGroupIdList, levelUserId);
 		}
 		//更换教务老师等数据
 		employeeDao.employeeLevel(employeeLevelDtos);

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupModel.java

@@ -1,5 +1,8 @@
 package com.ym.mec.common.entity;
 
+import java.util.List;
+
+public class ImGroupModel{
     //群组编号
     private String id;
     //用户列表