| 
					
				 | 
			
			
				@@ -1,14 +1,11 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package com.ym.mec.biz.service.impl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ym.mec.auth.api.entity.SysUser; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.dao.CourseScheduleDao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.dao.StudentCourseHomeworkReplyDao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.dao.TeacherDao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.dto.StudentCourseHomeworkCommentDto; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ym.mec.biz.dal.entity.CourseSchedule; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.entity.StudentCourseHomework; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.entity.StudentCourseHomeworkReply; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ym.mec.biz.dal.enums.MessageTypeEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.page.StudentCourseHomeworkReplyQueryInfo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.service.StudentCourseHomeworkReplyService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.service.StudentCourseHomeworkService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -18,13 +15,13 @@ import com.ym.mec.common.exception.BizException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.page.PageInfo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.page.QueryInfo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.service.impl.BaseServiceImpl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ym.mec.thirdparty.message.MessageSenderPluginContext; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ym.mec.util.date.DateUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.transaction.annotation.Transactional; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import java.util.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.ArrayList; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.Objects; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @Service 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long, StudentCourseHomeworkReply> implements StudentCourseHomeworkReplyService { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -52,13 +49,13 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if(Objects.isNull(studentCourseHomework)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			throw new BizException("请指定需要回复的作业"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		Map<Integer, String> userMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		SysUser user = teacherDao.getUser(studentCourseHomework.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"), user.getUsername()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		Map<Integer, String> userMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		SysUser user = teacherDao.getUser(studentCourseHomework.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//				userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"), user.getUsername()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return super.insert(bean); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -73,13 +70,13 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				studentCourseHomework.getCourseHomeworkId(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				studentCourseHomework.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		Map<Integer, String> userMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		SysUser user = teacherDao.get(courseSchedule.getTeacherId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		Map<Integer, String> userMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		SysUser user = teacherDao.get(courseSchedule.getTeacherId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		super.insert(bean); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |