|
@@ -462,7 +462,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
//获取当前日期周几
|
|
|
int weekNum = firstDay.getDayOfWeek().getValue();
|
|
|
JSONArray jsonArray = teacherPracticeTime.get(weekNum);
|
|
|
- if (Objects.nonNull(jsonArray)){
|
|
|
+ if (Objects.nonNull(jsonArray)) {
|
|
|
List<CourseTimeEntity> timeEntities = jsonArray.stream()
|
|
|
.map(t -> getCourseTimeEntity(entity, (JSONObject) t))
|
|
|
.collect(Collectors.toList());
|
|
@@ -953,41 +953,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public void practiceSend(Long teacherId, Long studentId,String courseNum,String orderNo) {
|
|
|
- //查询老师&学生信息
|
|
|
- SysUser teacher = sysUserFeignService.queryUserById(teacherId);
|
|
|
- SysUser student = sysUserFeignService.queryUserById(studentId);
|
|
|
-
|
|
|
- //消息接收者(Key:用户编号 value:消息接收对象)
|
|
|
- Map<Long, String> teacherReceivers = new HashMap<>();
|
|
|
- teacherReceivers.put(teacherId, teacher.getPhone());
|
|
|
- Map<Long, String> studentReceivers = new HashMap<>();
|
|
|
- studentReceivers.put(studentId, student.getPhone());
|
|
|
-
|
|
|
- //老师端-学生买陪练课
|
|
|
- String teacherUrl = sysMessageService.selectConfigUrl(MessageTypeEnum.STUDENT_BUY_PRACTICE.getCode());
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_BUY_PRACTICE,
|
|
|
- teacherReceivers, null, 0, null, ClientEnum.TEACHER.getCode(),
|
|
|
- student.getUsername(),courseNum, teacherUrl);
|
|
|
-
|
|
|
- //学生端-买陪练课
|
|
|
- String studentUrl = sysMessageService.selectConfigUrl(MessageTypeEnum.PRACTICE_BUY.getCode());
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_BUY,
|
|
|
- studentReceivers, null, 0, null, ClientEnum.STUDENT.getCode(),
|
|
|
- teacher.getUsername(), courseNum, studentUrl);
|
|
|
-
|
|
|
- //陪练课开课提醒
|
|
|
- List<String> startTimeList = baseMapper.selectStartTime(orderNo);
|
|
|
- for (String startTime : startTimeList) {
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PRACTICE_REMINDER,
|
|
|
- teacherReceivers, DateUtil.offsetMinute(startTime, -20), 0, null, ClientEnum.TEACHER.getCode(),
|
|
|
- student.getUsername());
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_REMIND,
|
|
|
- studentReceivers, DateUtil.offsetMinute(startTime, -20), 0, null, ClientEnum.STUDENT.getCode(),
|
|
|
- teacher.getUsername());
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 学生购买陪练课-失败-回调
|
|
|
*/
|
|
@@ -1024,16 +989,21 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @Description: 学生-首页-直播课&视频课
|
|
|
+ * @Description: 首页-直播课&视频课
|
|
|
* @Author: cy
|
|
|
* @Date: 2022/4/22
|
|
|
*/
|
|
|
@Override
|
|
|
- public StudentHomePage queryLiveAndVideo(Long studentId) {
|
|
|
+ public StudentHomePage queryLiveAndVideo(Long studentId,Long teacherId) {
|
|
|
StudentHomePage homePage = new StudentHomePage();
|
|
|
- homePage.setLiveList(baseMapper.selectLive());
|
|
|
- homePage.setVideoList(baseMapper.selectVideo());
|
|
|
- homePage.setRecentCourses(baseMapper.selectRecentCourses(studentId));
|
|
|
+ if (teacherId==null){
|
|
|
+ homePage.setLiveList(baseMapper.selectLive());
|
|
|
+ homePage.setVideoList(baseMapper.selectVideo());
|
|
|
+ homePage.setRecentCourses(baseMapper.selectRecentCourses(studentId));
|
|
|
+ }
|
|
|
+ if (studentId==null){
|
|
|
+ homePage.setRecentCourses(baseMapper.selectRecentCoursesTeacher(teacherId));
|
|
|
+ }
|
|
|
return homePage;
|
|
|
}
|
|
|
|
|
@@ -1065,4 +1035,75 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
public Integer getWeekStudentRepliedCourseSchedule(Long userId) {
|
|
|
return baseMapper.selectWeekStudentRepliedCourseSchedule(userId);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Description: 购买陪练课消息推送
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/5/6
|
|
|
+ */
|
|
|
+ public void practiceSend(Long teacherId, Long studentId, String courseNum, String orderNo) {
|
|
|
+ //查询老师&学生信息
|
|
|
+ SysUser teacher = sysUserFeignService.queryUserById(teacherId);
|
|
|
+ SysUser student = sysUserFeignService.queryUserById(studentId);
|
|
|
+
|
|
|
+ //消息接收者(Key:用户编号 value:消息接收对象)
|
|
|
+ Map<Long, String> teacherReceivers = new HashMap<>();
|
|
|
+ teacherReceivers.put(teacherId, teacher.getPhone());
|
|
|
+ Map<Long, String> studentReceivers = new HashMap<>();
|
|
|
+ studentReceivers.put(studentId, student.getPhone());
|
|
|
+ Map<Long, String> teacherSms = new HashMap<>();
|
|
|
+ teacherSms.put(teacherId, teacher.getPhone());
|
|
|
+ Map<Long, String> studentSms = new HashMap<>();
|
|
|
+ studentSms.put(studentId, student.getPhone());
|
|
|
+
|
|
|
+ //老师端-学生买陪练课
|
|
|
+ String teacherUrl = sysMessageService.selectConfigUrl(MessageTypeEnum.STUDENT_BUY_PRACTICE.getCode());
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_BUY_PRACTICE,
|
|
|
+ teacherReceivers, null, 0, null, ClientEnum.TEACHER.getCode(),
|
|
|
+ student.getUsername(), courseNum, teacherUrl);
|
|
|
+ log.info("send success {}",MessageTypeEnum.STUDENT_BUY_PRACTICE);
|
|
|
+
|
|
|
+ //老师端-学生买陪练课(短信)
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_STUDENT_BUY_PRACTICE,
|
|
|
+ teacherSms, null, 0, null, null,
|
|
|
+ student.getUsername(), courseNum);
|
|
|
+ log.info("send success {}",MessageTypeEnum.SMS_STUDENT_BUY_PRACTICE);
|
|
|
+
|
|
|
+ //学生端-买陪练课
|
|
|
+ String studentUrl = sysMessageService.selectConfigUrl(MessageTypeEnum.PRACTICE_BUY.getCode());
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_BUY,
|
|
|
+ studentReceivers, null, 0, null, ClientEnum.STUDENT.getCode(),
|
|
|
+ teacher.getUsername(), courseNum, studentUrl);
|
|
|
+ log.info("send success {}",MessageTypeEnum.PRACTICE_BUY);
|
|
|
+
|
|
|
+ //学生端-买陪练课(短信)
|
|
|
+ String studentSmsUrl = sysMessageService.selectConfigUrl(MessageTypeEnum.SMS_PRACTICE_BUY.getCode());
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PRACTICE_BUY,
|
|
|
+ studentSms, null, 0, null, null,
|
|
|
+ teacher.getUsername(), courseNum,studentSmsUrl);
|
|
|
+ log.info("send success {}",MessageTypeEnum.SMS_PRACTICE_BUY);
|
|
|
+
|
|
|
+ List<String> startTimeList = baseMapper.selectStartTime(orderNo);
|
|
|
+ for (String startTime : startTimeList) {
|
|
|
+ //老师端-陪练课开课提醒
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PRACTICE_REMINDER,
|
|
|
+ teacherReceivers, DateUtil.offsetMinute(startTime, -20), 0, null, ClientEnum.TEACHER.getCode(),
|
|
|
+ student.getUsername());
|
|
|
+
|
|
|
+ //学生端-陪练课开课提醒
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_REMIND,
|
|
|
+ studentReceivers, DateUtil.offsetMinute(startTime, -20), 0, null, ClientEnum.STUDENT.getCode(),
|
|
|
+ teacher.getUsername());
|
|
|
+ }
|
|
|
+ log.info("send success {}",MessageTypeEnum.PRACTICE_REMIND);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Description: 明日课程提醒(每晚9点)
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/5/6
|
|
|
+ */
|
|
|
+ public void courseRemind(){
|
|
|
+
|
|
|
+ }
|
|
|
}
|