|
@@ -483,6 +483,9 @@ public class MarkUserQuestionServiceImpl extends ServiceImpl<MarkUserQuestionMap
|
|
BasicMessageDto basicMessageDto = null;
|
|
BasicMessageDto basicMessageDto = null;
|
|
String templateCode = null;
|
|
String templateCode = null;
|
|
try {
|
|
try {
|
|
|
|
+ basicMessageDto = new BasicMessageDto(schoolId, userId, userName, mobileNumber, paperNumber,
|
|
|
|
+ courseCode, variableParams, messageType, createId,
|
|
|
|
+ remark, templateCode);
|
|
// code和content
|
|
// code和content
|
|
Map<String, String> enumInfo = smsSendUtil.getCodeAndContentByEnum(messageType);
|
|
Map<String, String> enumInfo = smsSendUtil.getCodeAndContentByEnum(messageType);
|
|
if (!enumInfo.containsKey("templateCode")) {
|
|
if (!enumInfo.containsKey("templateCode")) {
|
|
@@ -516,9 +519,6 @@ public class MarkUserQuestionServiceImpl extends ServiceImpl<MarkUserQuestionMap
|
|
throw ExceptionResultEnum.ERROR.exception("短信内容参数值必填");
|
|
throw ExceptionResultEnum.ERROR.exception("短信内容参数值必填");
|
|
}
|
|
}
|
|
|
|
|
|
- basicMessageDto = new BasicMessageDto(schoolId, userId, userName, mobileNumber, paperNumber,
|
|
|
|
- courseCode, variableParams, messageType, createId,
|
|
|
|
- remark, templateCode);
|
|
|
|
// 调用阿里云短信平台发送短信
|
|
// 调用阿里云短信平台发送短信
|
|
Map<String, Object> templateParam = JSON.parseObject(variableParams, Map.class);
|
|
Map<String, Object> templateParam = JSON.parseObject(variableParams, Map.class);
|
|
SmsResponseResult smsResponseResult = smsSendUtil.sendSms(mobileNumber, templateCode, templateParam);
|
|
SmsResponseResult smsResponseResult = smsSendUtil.sendSms(mobileNumber, templateCode, templateParam);
|
|
@@ -548,6 +548,9 @@ public class MarkUserQuestionServiceImpl extends ServiceImpl<MarkUserQuestionMap
|
|
List<MarkTaskSmsDto> markTaskSmsDtoList = this.findMarkTaskSms(examId, courseId, paperNumber);
|
|
List<MarkTaskSmsDto> markTaskSmsDtoList = this.findMarkTaskSms(examId, courseId, paperNumber);
|
|
if (CollectionUtils.isNotEmpty(markTaskSmsDtoList)) {
|
|
if (CollectionUtils.isNotEmpty(markTaskSmsDtoList)) {
|
|
for (MarkTaskSmsDto m : markTaskSmsDtoList) {
|
|
for (MarkTaskSmsDto m : markTaskSmsDtoList) {
|
|
|
|
+ if(StringUtils.isBlank(m.getMobileNumber())){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
StringJoiner stringJoiner = new StringJoiner("-");
|
|
StringJoiner stringJoiner = new StringJoiner("-");
|
|
stringJoiner.add(m.getExamId().toString()).add(m.getCourseId().toString()).add(m.getPaperNumber());
|
|
stringJoiner.add(m.getExamId().toString()).add(m.getCourseId().toString()).add(m.getPaperNumber());
|
|
int count = this.smsConditionCount(m.getUserId(), m.getMobileNumber(), stringJoiner.toString());
|
|
int count = this.smsConditionCount(m.getUserId(), m.getMobileNumber(), stringJoiner.toString());
|