diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java index 5ee7a59..914779b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java @@ -2,18 +2,24 @@ package org.jeecg.modules.api.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.util.AssertUtils; +import org.jeecg.modules.ocr.entity.OcrRuleCheck; import org.jeecg.modules.ocr.model.OcrMetadataConfigSaveModel; +import org.jeecg.modules.ocr.service.IOcrRuleCheckService; +import org.jeecg.modules.ocr.vo.OcrRuleCheckVo; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.List; @@ -26,6 +32,8 @@ import java.util.List; @RestController @RequestMapping("/api") public class ApiController { + @Resource + private IOcrRuleCheckService ocrRuleCheckService; ////===================================================================伪接口 @ApiOperation(value="通用识别", notes="通用识别") @PostMapping(value = "/identify") @@ -51,12 +59,14 @@ public class ApiController { @ApiOperation(value="获取规则", notes="获取规则") @PostMapping(value = "/getRule") @Transactional(rollbackFor = Exception.class) - public JSONObject getRule() { + public Result> getRule() { + IPage ocrRuleCheckVoIPage = ocrRuleCheckService.pageVo(new Page(1, Integer.MAX_VALUE), new OcrRuleCheck()); + return Result.OK(ocrRuleCheckVoIPage.getRecords()); /*String requestId = jsonObject.getString("requestId"); String fileName = jsonObject.getString("fileName"); AssertUtils.notEmpty(requestId,"请输入[请求唯一标识]"); AssertUtils.notEmpty(fileName,"请输入[图片名称]");*/ - return JSONObject.parseObject("{\"result\":[{\"ruleId\":\"15\",\"ruleName\":\"门头照片规则1\",\"ruleInfo\":\"hospitalName=1&doctorName=0&departmentName=1&time=0\",\"metadataId\":\"8\",\"metadataName\":\"门头照片元数据配置\",\"createTime\":\"2023-07-18 16:33\",\"createPeople\":\"admin\"},{\"ruleId\":\"18\",\"ruleName\":\"票据照片规则1\",\"ruleInfo\":\"number=1&companyName=1\",\"metadataId\":\"9\",\"metadataName\":\"票据照片元数据配置\",\"createTime\":\"2023-07-18 16:33\",\"createPeople\":\"admin\"}]}"); + //return JSONObject.parseObject("{\"result\":[{\"ruleId\":\"15\",\"ruleName\":\"门头照片规则1\",\"ruleInfo\":\"hospitalName=1&doctorName=0&departmentName=1&time=0\",\"metadataId\":\"8\",\"metadataName\":\"门头照片元数据配置\",\"createTime\":\"2023-07-18 16:33\",\"createPeople\":\"admin\"},{\"ruleId\":\"18\",\"ruleName\":\"票据照片规则1\",\"ruleInfo\":\"number=1&companyName=1\",\"metadataId\":\"9\",\"metadataName\":\"票据照片元数据配置\",\"createTime\":\"2023-07-18 16:33\",\"createPeople\":\"admin\"}]}"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java index 874929f..95b084c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController; public class OcrApiController { /** * 1. 收到 任务 入参 任务id,图片路径[] + * POST /semantic + * application/json * 2. 调用java接口,入参 * 任务id, * 图片路径,