Browse Source

加入推送云阅卷数据可重新推送

wangliang 2 năm trước cách đây
mục cha
commit
5f5a3bbcc4

+ 7 - 0
themis-admin/src/main/java/com/qmth/themis/admin/ThemisAdminApplication.java

@@ -1,10 +1,12 @@
 package com.qmth.themis.admin;
 
+import com.qmth.themis.business.base.CustomizedSqlInjector;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -27,4 +29,9 @@ public class ThemisAdminApplication {
     public static void main(String[] args) {
         SpringApplication.run(ThemisAdminApplication.class, args);
     }
+
+    @Bean
+    public CustomizedSqlInjector customizedSqlInjector() {
+        return new CustomizedSqlInjector();
+    }
 }

+ 12 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamQueryDto.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.dto.response;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.themis.business.enums.TaskStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -86,6 +87,17 @@ public class TEExamQueryDto implements Serializable {
     @ApiModelProperty(value = "是否推送违纪考生,false:否,true:是")
     private Boolean examStudentBreachPush = false;
 
+    @ApiModelProperty(value = "云阅卷推送状态")
+    private TaskStatusEnum cloudMarkPushDataStatus;
+
+    public TaskStatusEnum getCloudMarkPushDataStatus() {
+        return cloudMarkPushDataStatus;
+    }
+
+    public void setCloudMarkPushDataStatus(TaskStatusEnum cloudMarkPushDataStatus) {
+        this.cloudMarkPushDataStatus = cloudMarkPushDataStatus;
+    }
+
     public Integer getExamStudentCallEnable() {
         return examStudentCallEnable;
     }

+ 1 - 0
themis-business/src/main/resources/mapper/TEExamMapper.xml

@@ -49,6 +49,7 @@
         t.monitorStatus,
         t.examStudentCallEnable,
         t.objectiveScorePush,
+        (select tbth.status from t_b_task_history tbth where tbth.exam_id = t.id and tbth.`type` = 'CLOUD_MARK_DATA_PUSH' and tbth.progress = 100 order by tbth.create_time desc limit 1) as cloudMarkPushDataStatus,
         t.examStudentBreachPush
         <if test="type != null and type != '' and type == 'monitor'">
             ,group_concat(distinct tees.room_code) as roomCode,

+ 7 - 0
themis-exam/src/main/java/com/qmth/themis/exam/ThemisExamApplication.java

@@ -1,10 +1,12 @@
 package com.qmth.themis.exam;
 
+import com.qmth.themis.business.base.CustomizedSqlInjector;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -22,4 +24,9 @@ public class ThemisExamApplication {
     public static void main(String[] args) {
         SpringApplication.run(ThemisExamApplication.class, args);
     }
+
+    @Bean
+    public CustomizedSqlInjector customizedSqlInjector() {
+        return new CustomizedSqlInjector();
+    }
 }

+ 6 - 0
themis-task/src/main/java/com/qmth/themis/task/ThemisTaskApplication.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.task;
 
+import com.qmth.themis.business.base.CustomizedSqlInjector;
 import com.qmth.themis.task.listener.MyJobListener;
 import org.mybatis.spring.annotation.MapperScan;
 import org.quartz.Scheduler;
@@ -35,4 +36,9 @@ public class ThemisTaskApplication {
         scheduler.getListenerManager().addJobListener(new MyJobListener());
         return scheduler;
     }
+
+    @Bean
+    public CustomizedSqlInjector customizedSqlInjector() {
+        return new CustomizedSqlInjector();
+    }
 }