xiatian 1 년 전
부모
커밋
b1a7a6bff2
2개의 변경된 파일20개의 추가작업 그리고 3개의 파일을 삭제
  1. 12 2
      src/main/java/cn/com/qmth/am/controller/AdminController.java
  2. 8 1
      src/main/java/cn/com/qmth/am/task/BuildImageJob.java

+ 12 - 2
src/main/java/cn/com/qmth/am/controller/AdminController.java

@@ -33,6 +33,7 @@ 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
@@ -65,6 +66,8 @@ public class AdminController {
 			}
 			qsCourse = cset.size();
 		}
+		sb.append("ocr任务是否开启:" + (BuildImageJob.enable ? "是" : "否") + "\r\n");
+		sb.append("评分任务是否开启:" + (AiMarkingJob.enable ? "是" : "否") + "\r\n");
 		sb.append("试卷科目总数:" + qsCourse + "\r\n");
 		sb.append("试卷小题总数:" + qstotal + "\r\n");
 		int total = studentService.countBy(examId, null);
@@ -85,12 +88,12 @@ public class AdminController {
 			return;
 		}
 		sb.append("考生试题总数:" + qtotal + "\r\n");
-		
+
 		int qocrsuc = studentScoreService.countOcrBy(examId, DataStatus.SUCCESS);
 		sb.append("考生试题OCR成功总数:" + qocrsuc + "\r\n");
 		int qocrfailed = studentScoreService.countOcrBy(examId, DataStatus.FAILED);
 		sb.append("考生试题OCR失败总数:" + qocrfailed + "\r\n");
-		
+
 		int qsuc = studentScoreService.countBy(examId, DataStatus.SUCCESS);
 		sb.append("考生试题评分成功总数:" + qsuc + "\r\n");
 		int qfailed = studentScoreService.countBy(examId, DataStatus.FAILED);
@@ -179,6 +182,13 @@ public class AdminController {
 		AiMarkingJob.enable = enable;
 		return "设置成功:" + enable;
 	}
+	
+	@ApiOperation(value = "ocr开关")
+	@RequestMapping(value = "ocr/status", method = RequestMethod.GET)
+	public String ocrStatus(@RequestParam Boolean enable) {
+		BuildImageJob.enable = enable;
+		return "设置成功:" + enable;
+	}
 
 	private void returnJson(String body, HttpServletResponse response) {
 		response.setContentType("application/json;charset=utf-8");

+ 8 - 1
src/main/java/cn/com/qmth/am/task/BiuldImageJob.java → src/main/java/cn/com/qmth/am/task/BuildImageJob.java

@@ -24,7 +24,8 @@ import cn.com.qmth.am.service.StudentService;
 import cn.com.qmth.am.utils.SpringContextHolder;
 
 @Service
-public class BiuldImageJob {
+public class BuildImageJob {
+	public static Boolean enable=true;
 	@Autowired
 	private StudentService studentService;
 	@Autowired
@@ -54,6 +55,9 @@ public class BiuldImageJob {
 
 	@Scheduled(fixedDelay = 5 * 1000, initialDelay = 20 * 1000)
 	public void doJob() {
+		if(!enable) {
+			return;
+		}
 		List<StudentEntity> stus = studentService.findToDispose();
 		if (CollectionUtils.isEmpty(stus)) {
 			return;
@@ -87,6 +91,9 @@ public class BiuldImageJob {
 			tem.put(q.getId(),q);
 		}
 		for (StudentEntity stu : stus) {
+			if(!enable) {
+				return;
+			}
 			String key=stu.getExamId()+"-"+stu.getSubjectCode();
 			Map<Long,QuestionEntity> tem=qmap.get(key);
 			if(tem!=null) {