update

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

@@ -236,7 +236,8 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
 
 //                        Map<Integer, String> userMap = new HashMap<>();
 //                        userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());
-                        String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
+                        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);

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

@@ -3,6 +3,7 @@ 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.SysConfigDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.StudentCourseHomeworkCommentDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -12,6 +13,7 @@ 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;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -38,6 +40,8 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 	@Autowired
 	private TeacherDao teacherDao;
 	@Autowired
+	private SysConfigDao sysConfigDao;
+	@Autowired
 	private SysMessageService sysMessageService;
 
 	@Override
@@ -56,7 +60,13 @@ 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());
-		String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
+		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());
@@ -80,7 +90,10 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 //		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();
+		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());

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

@@ -7,15 +7,13 @@ import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.dto.StudentCourseHomeworkDto;
 import com.ym.mec.biz.dal.dto.StudentHomeworkRecordDto;
-import com.ym.mec.biz.dal.entity.CourseHomework;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleReview;
-import com.ym.mec.biz.dal.entity.StudentCourseHomework;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.service.CourseHomeworkService;
 import com.ym.mec.biz.service.StudentCourseHomeworkService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -53,6 +51,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     private CourseScheduleReviewDao courseScheduleReviewDao;
     @Autowired
     private TeacherDao teacherDao;
+    @Autowired
+    private SysConfigDao sysConfigDao;
 
     @Override
     public BaseDAO<Long, StudentCourseHomework> getDAO() {
@@ -104,7 +104,11 @@ 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());
-        String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId();
+        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());