Browse Source

阅卷待办短信

wangliang 3 months ago
parent
commit
c1e64fc0cd

+ 23 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/MarkTaskSmsDto.java

@@ -42,6 +42,29 @@ public class MarkTaskSmsDto implements Serializable {
     @ApiModelProperty(value = "阅卷题目数")
     @ApiModelProperty(value = "阅卷题目数")
     private Integer markQuestionCount;
     private Integer markQuestionCount;
 
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long schoolId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String realName;
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public Long getExamId() {
     public Long getExamId() {
         return examId;
         return examId;
     }
     }

+ 5 - 1
teachcloud-mark/src/main/resources/mapper/MarkUserQuestionMapper.xml

@@ -261,6 +261,8 @@
             be.name as examName,
             be.name as examName,
             bc.name as courseName,
             bc.name as courseName,
             su.mobile_number as mobileNumber,
             su.mobile_number as mobileNumber,
+            su.school_id as schoolId,
+            su.real_name as realName,
             count(muq.user_id) as markQuestionCount
             count(muq.user_id) as markQuestionCount
         from
         from
             mark_user_question muq
             mark_user_question muq
@@ -286,7 +288,9 @@
             muq.user_id,
             muq.user_id,
             be.name,
             be.name,
             bc.name,
             bc.name,
-            su.mobile_number
+            su.mobile_number,
+            su.school_id,
+            su.real_name
         order by muq.user_id
         order by muq.user_id
     </select>
     </select>
 </mapper>
 </mapper>

+ 7 - 1
teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/impl/JobServiceImpl.java

@@ -1,5 +1,7 @@
 package com.qmth.teachcloud.task.job.service.impl;
 package com.qmth.teachcloud.task.job.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
+import com.google.common.collect.ImmutableMap;
 import com.qmth.boot.redis.uid.RedisMachineService;
 import com.qmth.boot.redis.uid.RedisMachineService;
 import com.qmth.distributed.print.business.bean.dto.initMarkData.ExamDetailCourseInitMarkDto;
 import com.qmth.distributed.print.business.bean.dto.initMarkData.ExamDetailCourseInitMarkDto;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.entity.*;
@@ -13,6 +15,7 @@ import com.qmth.teachcloud.common.bean.vo.PaperInfoVo;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
+import com.qmth.teachcloud.common.enums.MessageEnum;
 import com.qmth.teachcloud.common.enums.PushTypeEnum;
 import com.qmth.teachcloud.common.enums.PushTypeEnum;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
@@ -35,6 +38,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Objects;
@@ -154,7 +158,9 @@ public class JobServiceImpl implements JobService {
                 List<MarkTaskSmsDto> markTaskSmsDtoList = markUserQuestionService.findMarkTaskSms(markPaper.getExamId(), markPaper.getCourseId(), markPaper.getPaperNumber());
                 List<MarkTaskSmsDto> markTaskSmsDtoList = markUserQuestionService.findMarkTaskSms(markPaper.getExamId(), markPaper.getCourseId(), markPaper.getPaperNumber());
                 if (CollectionUtils.isNotEmpty(markTaskSmsDtoList)) {
                 if (CollectionUtils.isNotEmpty(markTaskSmsDtoList)) {
                     for (MarkTaskSmsDto m : markTaskSmsDtoList) {
                     for (MarkTaskSmsDto m : markTaskSmsDtoList) {
-
+                        if (Objects.equals(m.getMobileNumber(), "18008659246")) {
+                            basicMessageService.saveMessageSendLog(m.getSchoolId(), m.getUserId(), m.getRealName(), m.getMobileNumber(), JSON.toJSONString(ImmutableMap.of("courseName", m.getCourseName(), "examName", m.getExamName())), MessageEnum.NOTICE_OF_MARK_TASK_CREATED);
+                        }
                     }
                     }
                 }
                 }
             }
             }