fix

src/main/java/cn/com/qmth/am/controller/AdminController.java

@@ -32,8 +32,6 @@ import cn.com.qmth.am.enums.LockType;
 import cn.com.qmth.am.service.QuestionService;
 import cn.com.qmth.am.service.StudentScoreService;
 import cn.com.qmth.am.service.StudentService;
-import cn.com.qmth.am.task.AiMarkingJob;
-import cn.com.qmth.am.task.BuildImageJob;
 import io.swagger.annotations.ApiOperation;
 
 @RestController
@@ -66,8 +64,8 @@ public class AdminController {
 			}
 			qsCourse = cset.size();
 		}
-		sb.append("ocr任务是否开启：" + (BuildImageJob.enable ? "是" : "否") + "\r\n");
-		sb.append("评分任务是否开启：" + (AiMarkingJob.enable ? "是" : "否") + "\r\n");
+		sb.append("ocr任务是否开启：" + (sysProperty.getOcrTaskEnable() ? "是" : "否") + "\r\n");
+		sb.append("评分任务是否开启：" + (sysProperty.getMarkingTaskEnable() ? "是" : "否") + "\r\n");
 		sb.append("试卷科目总数：" + qsCourse + "\r\n");
 		sb.append("试卷小题总数：" + qstotal + "\r\n");
 		int total = studentService.countBy(examId, null);
@@ -179,14 +177,14 @@ public class AdminController {
 	@ApiOperation(value = "机评开关")
 	@RequestMapping(value = "marking/status", method = RequestMethod.GET)
 	public String markingStatus(@RequestParam Boolean enable) {
-		AiMarkingJob.enable = enable;
+		sysProperty.setMarkingTaskEnable(enable);
 		return "设置成功：" + enable;
 	}
 	
 	@ApiOperation(value = "ocr开关")
 	@RequestMapping(value = "ocr/status", method = RequestMethod.GET)
 	public String ocrStatus(@RequestParam Boolean enable) {
-		BuildImageJob.enable = enable;
+		sysProperty.setOcrTaskEnable(enable);
 		return "设置成功：" + enable;
 	}
 

src/main/java/cn/com/qmth/am/service/impl/StudentScoreServiceImpl.java

@@ -507,6 +507,8 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
 			String ret = ocrDispose(dto, org);
 			if (ret != null) {
 				updateAnswer(dto.getStudentScoreId(), ret);
+			}else{
+				ocrErr(dto, "ocr失败");
 			}
 		} catch (Exception e) {
 			ocrErr(dto, e.getMessage());

src/main/java/cn/com/qmth/am/task/AiMarkingJob.java

@@ -16,7 +16,6 @@ import cn.com.qmth.am.service.StudentScoreService;
 
 @Service
 public class AiMarkingJob {
-	public static Boolean enable=null;
 	@Autowired
 	private StudentScoreService studentScoreService;
 	@Autowired
@@ -26,10 +25,7 @@ public class AiMarkingJob {
 
 	@Scheduled(fixedDelay = 5 * 1000, initialDelay = 20 * 1000)
 	public void doJob() {
-		if(enable==null) {
-			enable=sysProperty.getMarkingTaskEnable();
-		}
-		if(!enable) {
+		if(!sysProperty.getMarkingTaskEnable()) {
 			return;
 		}
 		List<StudentScoreEntity> scores = studentScoreService.findAllToAiMarking();
@@ -51,7 +47,7 @@ public class AiMarkingJob {
 
 	private void dispose(List<StudentScoreEntity> scores) {
 		for (StudentScoreEntity score : scores) {
-			if(!enable) {
+			if(!sysProperty.getMarkingTaskEnable()) {
 				return;
 			}
 			studentScoreService.aiMarking(score);

src/main/java/cn/com/qmth/am/task/BuildImageJob.java

@@ -26,7 +26,6 @@ import cn.com.qmth.am.utils.SpringContextHolder;
 
 @Service
 public class BuildImageJob {
-	public static Boolean enable=null;
 	@Autowired
 	private StudentService studentService;
 	@Autowired
@@ -57,10 +56,7 @@ public class BuildImageJob {
 
 	@Scheduled(fixedDelay = 5 * 1000, initialDelay = 20 * 1000)
 	public void doJob() {
-		if(enable==null) {
-			enable=sysProperty.getOcrTaskEnable();
-		}
-		if(!enable) {
+		if(!sysProperty.getOcrTaskEnable()) {
 			return;
 		}
 		List<StudentEntity> stus = studentService.findToDispose();
@@ -96,7 +92,7 @@ public class BuildImageJob {
 			tem.put(q.getId(),q);
 		}
 		for (StudentEntity stu : stus) {
-			if(!enable) {
+			if(!sysProperty.getOcrTaskEnable()) {
 				return;
 			}
 			String key=stu.getExamId()+"-"+stu.getSubjectCode();