diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/controller/AppOcrController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/controller/AppOcrController.java index f7a55d2d..f7783628 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/controller/AppOcrController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/controller/AppOcrController.java @@ -92,6 +92,14 @@ public class AppOcrController extends BaseController { return appOcrService.getOcrCode(bean); } + @ApiOperation(value = "获取ocr编码") + @PreventRepeatSubmit + @PostMapping("/getOcrCodeTwo") + public AjaxResult getOcrCodeTwo(@RequestBody MachineOcrBean bean) + { + return appOcrService.getOcrCodeTwo(bean); + } + @ApiOperation(value = "推送设备至第三方入库") @PreventRepeatSubmit @PostMapping("/addDeviceNumber") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/AppOcrService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/AppOcrService.java index 5868dd14..d43d5a83 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/AppOcrService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/AppOcrService.java @@ -61,4 +61,11 @@ public interface AppOcrService { * @return */ AjaxResult addDeviceNumber(MachineOcrBean bean); + + /** + * 获取ocr编码 + * @param bean + * @return + */ + AjaxResult getOcrCodeTwo(MachineOcrBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/AppOcrServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/AppOcrServiceImpl.java index 093d871c..cb4a6989 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/AppOcrServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/AppOcrServiceImpl.java @@ -263,6 +263,23 @@ public class AppOcrServiceImpl implements AppOcrService { return AjaxResult.success(js); } + @Override + public AjaxResult getOcrCodeTwo(MachineOcrBean bean) { + String url = "http://10.138.55.102:10000/api_gqj/pre"; + JSONObject js = null; + try { + System.out.println("ocr-base64数据:" + bean.getImage()); + String jsonStr = JSONObject.toJSONString(bean); + String data = HttpHelper.sendHttpPostForToken(url, jsonStr); + System.out.println("ocr返回数据:" + data); + js = JSONObject.parseObject(data); + } catch (Exception e) { + e.printStackTrace(); + log.error("获取OCR编码失败:" + e.getMessage()); + } + return AjaxResult.success(js); + } + /** * 推送设备至第三方入库 * @param bean