Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -489,7 +489,7 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @param classGroupId
 	 * @return
 	 */
-    List<Integer> queryTeacherByTeaching(@Param("classGroupId") Integer classGroupId);
+    List<Integer> queryTeacherByTeaching(@Param("classGroupId") Integer classGroupId,@Param("teacherRole") String teacherRole);
 
 	/**
 	 * 根据助教主教获取教师列表

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

@@ -2989,6 +2989,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         
         imGroupService.create(classGroup.getId().longValue(), musicGroup.getTeamTeacherId(), classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
         imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imUserFriendService.classGroupAddStudent(classGroup.getId(),userIds);
         return true;
     }
 

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

@@ -3229,7 +3229,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					ta.setMusicGroupId(newCourseSchedule.getMusicGroupId());
 					ta.setTeacherId(teacherId);
 					insertTeacherAttendanceList.add(ta);
-					imUserFriendService.classGroupChangeTeacher(newCourseSchedule.getClassGroupId(), teacherId);
+					imUserFriendService.courseScheduleChangeTeacher(courseScheduleId, teacherId);
 				}
 				
 			}
@@ -4614,6 +4614,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
 		//清除考勤申述
 		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
+		//添加通讯录
+		imUserFriendService.classGroupChangeTeacher(oldCourseSchedule.getClassGroupId(),teacherId);
 		//保存修改记录
 		saveModifyLog(modifyLogs,courseIds);
 
@@ -4987,7 +4989,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		//获取助教老师列表
 		if(courseSchedules.size() > 0){
 			courseSchedules.forEach(e->{
-				e.setTeachingTeacherIdList(courseScheduleTeacherSalaryDao.queryTeacherByTeaching(e.getClassGroupId()));
+				e.setTeachingTeacherIdList(courseScheduleTeacherSalaryDao.queryTeacherByTeaching(e.getClassGroupId(),"TEACHING"));
 				e.setActualTeacherId(targetTeacherId);
 			});
 			this.courseAdjust(courseSchedules);

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

@@ -82,6 +82,8 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
     @Autowired
     private ImFeignService imFeignService;
     @Autowired
+    private ImUserFriendService imUserFriendService;
+    @Autowired
     private TeacherFreeTimeDao teacherFreeTimeDao;
     @Autowired
     private CourseScheduleService courseScheduleService;
@@ -579,6 +581,10 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         practiceGroup.setGroupStatus(GroupStatusEnum.NORMAL);
         practiceGroupDao.update(practiceGroup);
 
+        imUserFriendService.groupChangeEducation(practiceGroup.getId().toString(), practiceGroup.getEducationalTeacherId(), GroupType.PRACTICE);
+        imUserFriendService.classGroupChangeTeacher(classGroup.getId(), practiceGroup.getUserId());
+        imUserFriendService.classGroupAddStudent(classGroup.getId(), Arrays.asList(practiceGroup.getStudentId()));
+
         try {
             contractService.transferPracticeCoursesContract(order.getUserId(),classGroup.getTotalClassTimes(),practiceGroup.getCoursesStartDate(),practiceGroup.getCoursesExpireDate(),order.getExpectAmount());
         } catch (Exception e) {
@@ -1154,6 +1160,10 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             e.printStackTrace();
         }
 
+        imUserFriendService.groupChangeEducation(practiceGroupBuyParams.getId().toString(), practiceGroupBuyParams.getEducationalTeacherId(), GroupType.PRACTICE);
+        imUserFriendService.classGroupChangeTeacher(classGroup.getId(), practiceGroupBuyParams.getUserId());
+        imUserFriendService.classGroupAddStudent(classGroup.getId(), Arrays.asList(practiceGroupBuyParams.getStudentId()));
+
         studentDao.updateStudentServiceTag(practiceGroupBuyParams.getStudentId(),null,YesOrNoEnum.YES.getCode());
 
         return BaseController.succeed();

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

@@ -19,8 +19,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.ym.mec.biz.dal.enums.GroupType.MUSIC;
-import static com.ym.mec.biz.dal.enums.GroupType.VIP;
+import static com.ym.mec.biz.dal.enums.GroupType.*;
 
 @Service
 public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend> implements ImUserFriendService {
@@ -38,6 +37,8 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 	@Autowired
 	private VipGroupDao vipGroupDao;
 	@Autowired
+	private PracticeGroupDao practiceGroupDao;
+	@Autowired
 	private TeacherDao teacherDao;
 	@Autowired
 	private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
@@ -141,8 +142,8 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 		//获取班级关联的老师
 		List<ClassGroupTeacherMapper> classGroupTeacherMappers = classGroupTeacherMapperDao.findByClassGroup(classGroupId);
 		teacherIds.addAll(classGroupTeacherMappers.stream().map(e->e.getUserId()).collect(Collectors.toSet()));
-		//学员关联的课程上的主教老师
-		teacherIds.add(courseScheduleTeacherSalaryDao.queryTeacherByBishop(classGroupId));
+		//学员关联的课程上的老师
+		teacherIds.addAll(courseScheduleTeacherSalaryDao.queryTeacherByTeaching(classGroupId,null));
 		teacherIds.addAll(studentIds);
 
 		MusicGroup musicGroup = new MusicGroup();
@@ -164,6 +165,10 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 			VipGroup vipGroup = vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
 			teacherIds.add(vipGroup.getEducationalTeacherId());
 			educations.add(vipGroup.getEducationalTeacherId());
+		}else if(groupType == PRACTICE){
+			PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
+			teacherIds.add(practiceGroup.getEducationalTeacherId());
+			educations.add(practiceGroup.getEducationalTeacherId());
 		}
 		educations.removeAll(Collections.singleton(null));
 		teacherIds.removeAll(Collections.singleton(null));
@@ -256,6 +261,10 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 			VipGroup vipGroup = vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
 			studentIds.add(vipGroup.getEducationalTeacherId());
 			educations.add(vipGroup.getEducationalTeacherId());
+		}else if(groupType == PRACTICE){
+			PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
+			studentIds.add(practiceGroup.getEducationalTeacherId());
+			educations.add(practiceGroup.getEducationalTeacherId());
 		}
 		educations.removeAll(Collections.singleton(null));
 		studentIds.removeAll(Collections.singleton(null));
@@ -383,6 +392,10 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 			VipGroup vipGroup = vipGroupDao.get(Long.parseLong(courseSchedule.getMusicGroupId()));
 			educations.add(vipGroup.getEducationalTeacherId());
 			studentIds.add(vipGroup.getEducationalTeacherId());
+		}else if(groupType == PRACTICE){
+			PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(courseSchedule.getMusicGroupId()));
+			studentIds.add(practiceGroup.getEducationalTeacherId());
+			educations.add(practiceGroup.getEducationalTeacherId());
 		}
 		educations.removeAll(Collections.singleton(null));
 		studentIds.removeAll(Collections.singleton(null));

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

@@ -97,6 +97,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Autowired
     private ImFeignService imFeignService;
     @Autowired
+    private ImUserFriendService imUserFriendService;
+    @Autowired
     private TeacherFreeTimeDao teacherFreeTimeDao;
     @Autowired
     private CourseScheduleService courseScheduleService;
@@ -2075,6 +2077,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
         courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 
+        imUserFriendService.groupChangeEducation(practiceGroup.getId().toString(), practiceGroup.getEducationalTeacherId(), GroupType.PRACTICE);
+        imUserFriendService.classGroupChangeTeacher(classGroup.getId(), practiceGroup.getUserId());
+        imUserFriendService.classGroupAddStudent(classGroup.getId(), Arrays.asList(practiceGroup.getStudentId()));
+
         //推送
         List<CourseSchedule> courseSchedules1 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(0), DateUtil.addMinutes(allCourseDates.get(0), practiceCourseMinutes));
         List<CourseSchedule> courseSchedules2 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(1), DateUtil.addMinutes(allCourseDates.get(1), practiceCourseMinutes));
@@ -3266,6 +3272,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         practiceGroup.setGroupStatus(GroupStatusEnum.NORMAL);
         practiceGroupDao.update(practiceGroup);
 
+        imUserFriendService.groupChangeEducation(practiceGroup.getId().toString(), practiceGroup.getEducationalTeacherId(), GroupType.PRACTICE);
+        imUserFriendService.classGroupChangeTeacher(classGroup.getId(), practiceGroup.getUserId());
+        imUserFriendService.classGroupAddStudent(classGroup.getId(), Arrays.asList(practiceGroup.getStudentId()));
+
         try {
             contractService.transferPracticeCoursesContract(order.getUserId(), classGroup.getTotalClassTimes(), practiceGroup.getCoursesStartDate(), practiceGroup.getCoursesExpireDate(), order.getExpectAmount());
         } catch (Exception e) {

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

@@ -1430,6 +1430,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroupApplyBaseInfoDto.getName(), null, null, GroupType.VIP.getCode());
 			imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
 			List<Integer> studentIds = classGroupStudents.stream().map(ClassGroupStudentMapper::getUserId).collect(Collectors.toList());
+
+			imUserFriendService.groupChangeEducation(vipGroupApplyBaseInfoDto.getId().toString(), vipGroupApplyBaseInfoDto.getEducationalTeacherId(), GroupType.PRACTICE);
+			imUserFriendService.classGroupChangeTeacher(classGroup.getId(), vipGroupApplyBaseInfoDto.getUserId());
 			imUserFriendService.classGroupAddStudent(classGroup.getId(), studentIds);
 
 			//发送推送短信
@@ -3103,6 +3106,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		try {
 			imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
 			imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+
+			imUserFriendService.groupChangeEducation(vipGroup.getId().toString(), vipGroup.getEducationalTeacherId(), GroupType.PRACTICE);
+			imUserFriendService.classGroupChangeTeacher(classGroup.getId(), vipGroup.getUserId());
 			imUserFriendService.classGroupAddStudent(classGroup.getId(), studentIds);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -1012,7 +1012,9 @@
     <select id="queryTeacherByTeaching" resultType="java.lang.Integer">
 		SELECT DISTINCT cgtm.user_id_ FROM class_group_teacher_mapper cgtm
 		WHERE cgtm.class_group_id_ = #{classGroupId}
-		  AND cgtm.teacher_role_ = 'TEACHING'
+		<if test="teacherRole != null">
+			AND cgtm.teacher_role_ = #{teacherRole}
+		</if>
 	</select>
     <select id="queryTeacherByBishop" resultType="java.lang.Integer">
 		SELECT DISTINCT cgtm.user_id_ FROM class_group_teacher_mapper cgtm

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -255,6 +255,29 @@ public class RoomServiceImpl implements RoomService {
         return roomResult;
     }
 
+    public RoomMember saveRoomMember(String roomId,String userId){
+        SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
+
+        Teacher teacher = teacherDao.get(Integer.parseInt(userId));
+        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
+
+        Date curTime = DateTimeUtils.currentUTC();
+
+        RoleEnum roleEnum;
+        RoomMember member = roomMemberDao.findByRidAndUid(roomId, userId);
+        String userName;
+        if (member == null) {
+            if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
+                roleEnum = RoleTeacher;
+                userName = sysUser.getRealName();
+            }else {
+                roleEnum = RoleStudent;
+                userName = sysUser.getUsername();
+            }
+            member = saveRoomMember(userId, sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime);
+        }
+        return member;
+    }
 
 
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
@@ -274,7 +297,7 @@ public class RoomServiceImpl implements RoomService {
     public void joinRoomSuccess(String roomId,String userId,String deviceNum) throws Exception {
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if(roomMember == null){
-            return ;
+            roomMember = saveRoomMember(roomId,userId);
         }
         String joinSuccessKey = "joinRoomSuccess"+ roomId + userId;
         if(redisTemplate.hasKey(joinSuccessKey)){
@@ -411,20 +434,33 @@ public class RoomServiceImpl implements RoomService {
     @Override
     public void leaveRoomSuccess(String roomId,String userId,String deviceNum) throws Exception {
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
-        if(roomMember == null){
-            return ;
-        }
         String leaveSuccessKey = "leaveRoomSuccess"+ roomId + userId;
         Integer firstCourseId = Integer.parseInt(roomId.substring(1));
         if(redisTemplate.hasKey(leaveSuccessKey)){
             redisTemplate.delete(leaveSuccessKey);
-            //如果设备号不为空，更新设备号
-            RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
-            if(roleEnum == RoleTeacher && StringUtils.isNotEmpty(deviceNum)){
-                teacherAttendanceService.addTeacherAttendanceSignOut(firstCourseId.longValue(),Integer.parseInt(userId),deviceNum);
+            if (StringUtils.isNotEmpty(deviceNum)){
+                //如果设备号不为空，更新设备号
+                RoleEnum roleEnum;
+                if(roomMember == null){
+                    Teacher teacher = teacherDao.get(Integer.parseInt(userId));
+                    CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
+                    if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
+                        roleEnum = RoleTeacher;
+                    }else {
+                        roleEnum = RoleStudent;
+                    }
+                }else {
+                    roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
+                }
+                if(roleEnum == RoleTeacher){
+                    teacherAttendanceService.addTeacherAttendanceSignOut(firstCourseId.longValue(),Integer.parseInt(userId),deviceNum);
+                }
             }
             return;
         }
+        if(roomMember == null){
+            return ;
+        }
         String joinSuccessKey = "joinRoomSuccess"+ roomId + userId;
         if(redisTemplate.hasKey(joinSuccessKey)){
             redisTemplate.delete(joinSuccessKey);

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

@@ -2,15 +2,14 @@ package com.ym.mec.web.controller;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -79,9 +78,11 @@ public class ContractsController extends BaseController {
 		return succeed(contractService.queryPracticeCoursesContract(sysUser.getId(), courseSectionNum, startDate, endDate, fee));
 	}
 
-	@GetMapping("transferProduceContract")
-	public HttpResponseResult transferProduceContract(Integer userId,String musicGroupId){
-		contractService.transferProduceContract(userId,musicGroupId);
+	@PostMapping("transferProduceContract")
+	public HttpResponseResult transferProduceContract(@RequestBody List<Integer> userIds){
+		for (Integer userId : userIds) {
+			contractService.transferProduceContract(userId,null);
+		}
 		return succeed();
 	}
 }