update

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

@@ -219,8 +219,8 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                 courseHomeworkService.insert(courseHomework);
 
                 if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
-                    List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
-                    Teacher teacher = teacherDao.get(courseScheduleReview.getTeacherId());
+//                    List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
+//                    Teacher teacher = teacherDao.get(courseScheduleReview.getTeacherId());
                     String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 1), "MM月dd日");
                     for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
                         StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
@@ -236,11 +236,11 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
 
 //                        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();
+//                        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(),
                                                         new String[]{courseScheduleStudentPayment.getUserId().toString()},
-                                                        notifyUrl,teacher.getRealName(), courseSchedule.getName(), dateStr);
+                                                        null,courseSchedule.getName(), dateStr);
 //                        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

@@ -60,16 +60,16 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 //		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();
+//		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(),
 				new String[]{courseSchedule.getActualTeacherId().toString()},
-				notifyUrl,courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"), user.getUsername());
+				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());
 		return super.insert(bean);
@@ -89,14 +89,14 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		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();
+//		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(),
 				new String[]{studentCourseHomework.getUserId().toString()},
-				notifyUrl,user.getRealName(), courseSchedule.getName());
+				null, courseSchedule.getName());
 //		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,14 +104,14 @@ 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();
+//        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(),
                 new String[]{courseSchedule.getActualTeacherId().toString()},
-                notifyUrl,courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日"), user.getUsername());
+                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());
         courseHomeworkService.update(courseHomework);

mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -33,6 +33,7 @@ public class PrivateController {
         privateMessage.setTargetId(imPrivateMessage.getTargetId());
         privateMessage.setSenderId(imPrivateMessage.getSenderId());
         privateMessage.setObjectName(imPrivateMessage.getObjectName());
+        privateMessage.setIsIncludeSender(1);
         return messageService.privateSend(privateMessage);
     }