|
|
@ -18,6 +18,7 @@ import org.jeecg.modules.ocr.service.IOcrRuleCheckService;
|
|
|
|
import org.jeecg.modules.ocr.utils.FileOUtils;
|
|
|
|
import org.jeecg.modules.ocr.utils.FileOUtils;
|
|
|
|
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
|
|
|
|
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
|
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
|
|
|
|
|
import org.springframework.scheduling.annotation.EnableAsync;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
|
@ -36,7 +37,7 @@ import java.util.stream.Collectors;
|
|
|
|
@Slf4j
|
|
|
|
@Slf4j
|
|
|
|
@RestController
|
|
|
|
@RestController
|
|
|
|
@RequestMapping("/api")
|
|
|
|
@RequestMapping("/api")
|
|
|
|
@Async
|
|
|
|
@EnableAsync
|
|
|
|
public class ApiController {
|
|
|
|
public class ApiController {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private IOcrRuleCheckService ocrRuleCheckService;
|
|
|
|
private IOcrRuleCheckService ocrRuleCheckService;
|
|
|
@ -50,6 +51,7 @@ public class ApiController {
|
|
|
|
@ApiOperation(value = "通用识别")
|
|
|
|
@ApiOperation(value = "通用识别")
|
|
|
|
@RequestMapping("/identify")
|
|
|
|
@RequestMapping("/identify")
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
|
|
|
|
@ResponseBody
|
|
|
|
public Result<?> pushSemantic(@RequestBody JSONObject requestBody){
|
|
|
|
public Result<?> pushSemantic(@RequestBody JSONObject requestBody){
|
|
|
|
if (requestBody==null) {
|
|
|
|
if (requestBody==null) {
|
|
|
|
return Result.error("请输入请求参数");
|
|
|
|
return Result.error("请输入请求参数");
|
|
|
@ -107,7 +109,7 @@ public class ApiController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "获取规则", notes = "获取规则")
|
|
|
|
@ApiOperation(value = "获取规则", notes = "获取规则")
|
|
|
|
@GetMapping(value = "/getRule")
|
|
|
|
@PostMapping(value = "/getRule")
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public Result<List<JSONObject>> getRule() {
|
|
|
|
public Result<List<JSONObject>> getRule() {
|
|
|
|
IPage<OcrRuleCheckVo> ocrRuleCheckVoIPage = ocrRuleCheckService.pageVo(new Page<OcrRuleCheck>(1, Integer.MAX_VALUE), new OcrRuleCheck());
|
|
|
|
IPage<OcrRuleCheckVo> ocrRuleCheckVoIPage = ocrRuleCheckService.pageVo(new Page<OcrRuleCheck>(1, Integer.MAX_VALUE), new OcrRuleCheck());
|
|
|
@ -156,7 +158,7 @@ public class ApiController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//==========================================================================================
|
|
|
|
//==========================================================================================
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "模拟创建任务", notes = "模拟创建任务")
|
|
|
|
/*@ApiOperation(value = "模拟创建任务", notes = "模拟创建任务")
|
|
|
|
@PostMapping(value = "/pushTask")
|
|
|
|
@PostMapping(value = "/pushTask")
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public Result pushTask(@RequestBody JSONObject jsonObject) {
|
|
|
|
public Result pushTask(@RequestBody JSONObject jsonObject) {
|
|
|
@ -206,9 +208,9 @@ public class ApiController {
|
|
|
|
//执行任务
|
|
|
|
//执行任务
|
|
|
|
executeTask();
|
|
|
|
executeTask();
|
|
|
|
return Result.OK("已追加到任务");
|
|
|
|
return Result.OK("已追加到任务");
|
|
|
|
}
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
/*@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Async
|
|
|
|
@Async
|
|
|
|
public void executeTask() {
|
|
|
|
public void executeTask() {
|
|
|
|
//获取任务
|
|
|
|
//获取任务
|
|
|
@ -238,11 +240,11 @@ public class ApiController {
|
|
|
|
log.error("任务已全部执行");
|
|
|
|
log.error("任务已全部执行");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
*//**
|
|
|
|
* 刷新任务状态
|
|
|
|
* 刷新任务状态
|
|
|
|
* @param taskId
|
|
|
|
* @param taskId
|
|
|
|
* @param status 状态 1 运行中,2 已结束
|
|
|
|
* @param status 状态 1 运行中,2 已结束
|
|
|
|
*/
|
|
|
|
*//*
|
|
|
|
public void flushTask(String taskId,int status) {
|
|
|
|
public void flushTask(String taskId,int status) {
|
|
|
|
List<TaskModel> taskList = getTaskList();
|
|
|
|
List<TaskModel> taskList = getTaskList();
|
|
|
|
if (taskList!=null && taskList.size()>0) {
|
|
|
|
if (taskList!=null && taskList.size()>0) {
|
|
|
@ -319,6 +321,6 @@ public class ApiController {
|
|
|
|
taskList.addAll(task3JsonArray.toJavaList(TaskModel.class));
|
|
|
|
taskList.addAll(task3JsonArray.toJavaList(TaskModel.class));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return taskList;
|
|
|
|
return taskList;
|
|
|
|
}
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|