|
@@ -53,12 +53,15 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
|
|
throw new BizException("请指定需要回复的作业");
|
|
throw new BizException("请指定需要回复的作业");
|
|
}
|
|
}
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
|
|
- Map<Integer, String> userMap = new HashMap<>();
|
|
|
|
- userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
|
|
|
|
|
|
+// Map<Integer, String> userMap = new HashMap<>();
|
|
|
|
+// userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
|
|
SysUser user = teacherDao.getUser(studentCourseHomework.getUserId());
|
|
SysUser user = teacherDao.getUser(studentCourseHomework.getUserId());
|
|
String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
|
|
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());
|
|
|
|
|
|
+ sysMessageService.batchSendImMessage(MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),
|
|
|
|
+ new String[]{courseSchedule.getActualTeacherId().toString()},
|
|
|
|
+ notifyUrl,courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"), user.getUsername());
|
|
|
|
+// 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);
|
|
return super.insert(bean);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -74,12 +77,15 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
|
|
studentCourseHomework.getUserId());
|
|
studentCourseHomework.getUserId());
|
|
|
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
|
|
- Map<Integer, String> userMap = new HashMap<>();
|
|
|
|
- userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString());
|
|
|
|
|
|
+// Map<Integer, String> userMap = new HashMap<>();
|
|
|
|
+// userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString());
|
|
SysUser user = teacherDao.get(courseSchedule.getTeacherId());
|
|
SysUser user = teacherDao.get(courseSchedule.getTeacherId());
|
|
String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
|
|
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());
|
|
|
|
|
|
+ sysMessageService.batchSendImMessage(MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getTeacherId().toString(),
|
|
|
|
+ new String[]{studentCourseHomework.getUserId().toString()},
|
|
|
|
+ notifyUrl,user.getRealName(), courseSchedule.getName());
|
|
|
|
+// sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
|
|
|
|
+// userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
|
|
super.insert(bean);
|
|
super.insert(bean);
|
|
}
|
|
}
|
|
|
|
|