|
|
@@ -26,6 +26,7 @@ import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.CourseScheduleHomeworkVo;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.StudentHomeworkVo;
|
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
|
+import com.yonge.toolset.base.string.MessageFormatter;
|
|
|
import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -233,6 +234,8 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
|
|
|
}
|
|
|
SysUser teacher = sysUserFeignService.queryUserById(teacherId);
|
|
|
String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TEACHER_DECORATE_HOMEWORK.getCode());
|
|
|
+
|
|
|
+ url = MessageFormatter.arrayFormat(url, courseScheduleId);
|
|
|
for (CourseScheduleStudentPayment courseScheduleStudentPayment : paymentList) {
|
|
|
SysUser student = sysUserFeignService.queryUserById(courseScheduleStudentPayment.getUserId());
|
|
|
Map<Long,String> studentReceivers = new HashMap<>();
|
|
|
@@ -240,7 +243,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
|
|
|
|
|
|
try {
|
|
|
sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum
|
|
|
- .TEACHER_DECORATE_HOMEWORK,studentReceivers, null, 0,url + courseScheduleId ,
|
|
|
+ .TEACHER_DECORATE_HOMEWORK,studentReceivers, null, 0,url ,
|
|
|
ClientEnum.STUDENT.getCode(),teacher.getUsername());
|
|
|
} catch (Exception e) {
|
|
|
log.warn("老师布置作业消息发送失败 学生id：{}",student.getId());
|
|
|
@@ -302,6 +305,8 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
|
|
|
Map<Long,String> studentReceivers = new HashMap<>();
|
|
|
studentReceivers.put(student.getId(), student.getPhone());
|
|
|
String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TEACHER_REVIEW_HOMEWORK.getCode());
|
|
|
+
|
|
|
+ url = MessageFormatter.arrayFormat(url, reviewDto.getCourseScheduleId());
|
|
|
sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_REVIEW_HOMEWORK,
|
|
|
studentReceivers, null, 0, url + reviewDto.getCourseScheduleId() , ClientEnum.STUDENT.getCode(), teacher.getUsername());
|
|
|
}
|
|
|
@@ -356,9 +361,9 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
|
|
|
receivers.put(teacher.getId(), teacher.getPhone());
|
|
|
|
|
|
String url = sysMessageService.selectConfigUrl(MessageTypeEnum.STUDENT_SUBMIT_HOMEWORK.getCode());
|
|
|
-
|
|
|
+ url = MessageFormatter.arrayFormat(url, submitDto.getCourseScheduleId(),student.getId());
|
|
|
sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SUBMIT_HOMEWORK,
|
|
|
- receivers, null, 0, url + submitDto.getCourseScheduleId(), ClientEnum.TEACHER.getCode(), student.getUsername());
|
|
|
+ receivers, null, 0, url, ClientEnum.TEACHER.getCode(), student.getUsername());
|
|
|
}
|
|
|
|
|
|
@Override
|
liujunchi