update

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -47,6 +47,10 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     STUDENT_PUSH_TEACHING_SCHOOL_CHANGE("STUDENT_PUSH_TEACHING_SCHOOL_CHANGE", "教学点变动"),
     STUDENT_PUSH_JOB_MESSAGE("STUDENT_PUSH_JOB_MESSAGE", "作业提醒"),
     HOMEWORK_REMIND("HOMEWORK_REMIND", "作业提醒-网管课"),
+    IM_HOMEWORK_REMIND("IM_HOMEWORK_REMIND", "作业提醒"),
+    IM_HOMEWORK_SUBMIT_PUSH("IM_HOMEWORK_SUBMIT_PUSH", "作业提交提醒"),
+    IM_HOMEWORK_STUDENT_REPLY_PUSH("IM_HOMEWORK_STUDENT_REPLY_PUSH", "作业回复提醒"),
+    IM_HOMEWORK_TEACHER_REPLY_PUSH("IM_HOMEWORK_TEACHER_REPLY_PUSH", "作业点评提醒"),
     STUDENT_PUSH_CLASS_MESSAGE("STUDENT_PUSH_CLASS_MESSAGE", "班级消息"),
     COMM_NO_STUDENTS_PUSH("COMM_NO_STUDENTS_PUSH", "对外课程组无学生提醒"),
     HOMEWORK_SUBMIT_PUSH("HOMEWORK_SUBMIT_PUSH", "学生提交作业提醒"),

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

@@ -220,7 +220,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
 
                 if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
 //                    List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
-//                    Teacher teacher = teacherDao.get(courseScheduleReview.getTeacherId());
+                    Teacher teacher = teacherDao.get(courseScheduleReview.getTeacherId());
                     String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 1), "MM月dd日");
                     for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
                         StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
@@ -234,15 +234,14 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                         studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
                         studentCourseHomeworkDao.insert(studentCourseHomework);
 
-//                        Map<Integer, String> userMap = new HashMap<>();
-//                        userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());
-//                        StringBuffer stringBuffer = new StringBuffer(sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL));
-//                        String notifyUrl = stringBuffer.append("?courseScheduleID=").append(courseSchedule.getId()).append("&studentCourseHomeworkId=").append(studentCourseHomework.getId()).toString();
-                        sysMessageService.batchSendImMessage(MessageTypeEnum.HOMEWORK_REMIND,courseScheduleReview.getTeacherId().toString(),
+                        Map<Integer, String> userMap = new HashMap<>();
+                        userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());
+                        String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
+                        sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,courseScheduleReview.getTeacherId().toString(),
                                                         new String[]{courseScheduleStudentPayment.getUserId().toString()},
-                                                        null,courseSchedule.getName(), dateStr);
-//                        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,
-//                                userMap, null, 0, notifyUrl, "STUDENT", teacher.getRealName(), courseSchedule.getName(), dateStr);
+                                                        null,courseSchedule.getName(), dateStr,courseHomework.getContent());
+                        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,
+                                userMap, null, 0, notifyUrl, "STUDENT", teacher.getRealName(), courseSchedule.getName(), dateStr);
                     }
                 }
             }

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

@@ -57,21 +57,18 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 			throw new BizException("请指定需要回复的作业");
 		}
 		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());
-//		StringBuffer stringBuffer = new StringBuffer(sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL));
-//		String notifyUrl = stringBuffer.append("?courseScheduleID=").append(studentCourseHomework.getId()).
-//				append("&userId=").append(studentCourseHomework.getUserId()).
-//				append("&studentCourseHomeworkId=").append(studentCourseHomework.getId()).toString();
 
-//		String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() +
-//				"&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
-		sysMessageService.batchSendImMessage(MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),
+		String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() +
+				"&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
+		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+		sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),
 				new String[]{courseSchedule.getActualTeacherId().toString()},
-				null,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());
+				null,courseDate,courseSchedule.getName(),bean.getContent());
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
+				userMap, null, 0, notifyUrl, "TEACHER", courseDate,courseSchedule.getName(), user.getUsername());
 		return super.insert(bean);
 	}
 
@@ -87,18 +84,16 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 				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());
-//		StringBuffer stringBuffer = new StringBuffer(sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL));
-//		String notifyUrl = stringBuffer.append("?courseScheduleID=").append(courseSchedule.getId()).
-//				append("&studentCourseHomeworkId=").append(studentCourseHomework.getId()).toString();
-//		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
-		sysMessageService.batchSendImMessage(MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getTeacherId().toString(),
+		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();
+		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+		sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getTeacherId().toString(),
 				new String[]{studentCourseHomework.getUserId().toString()},
-				null, courseSchedule.getName());
-//		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
-//				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
+				null, courseDate,courseSchedule.getName(),bean.getContent());
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
+				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
 		super.insert(bean);
 	}
 

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

@@ -104,16 +104,13 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         Map<Integer, String> userMap = new HashMap<>();
         userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
         SysUser user = teacherDao.getUser(bean.getUserId());
-//        StringBuffer stringBuffer = new StringBuffer(sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL));
-//        String notifyUrl = stringBuffer.append("?courseScheduleID=").append(bean.getId()).
-//                append("&userId=").append(bean.getUserId()).
-//                append("&studentCourseHomeworkId=").append(bean.getId()).toString();
-//        String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId();
-        sysMessageService.batchSendImMessage(MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),
+        String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId();
+        String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+        sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),
                 new String[]{courseSchedule.getActualTeacherId().toString()},
-                null,courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日"), user.getUsername());
-//        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
-//                userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日"), user.getUsername());
+                null,courseDate,courseSchedule.getName());
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
+                userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), courseDate, user.getUsername());
         courseHomeworkService.update(courseHomework);
     }