From c8501e6be2c7a828594a5a31d9e1ecaad18aaf6b Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Mon, 18 Mar 2024 18:47:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A0=E9=87=8F=E4=BA=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8B=89=E5=8F=96=E3=80=81=E7=9B=B8=E4=BC=BC=E5=BA=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=201.=E6=97=A0=E9=87=8F?= =?UTF-8?q?=E4=BA=91=E6=95=B0=E6=8D=AE=E6=8B=89=E5=8F=96=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=83=A8=E9=97=A8=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=94=BE?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E7=9B=B8?= =?UTF-8?q?=E4=BC=BC=E5=BA=A6=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoyao/ocr/api/entity/PictureSourceResult.java | 4 ++++ .../xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java | 3 +++ .../controller/OcrTaskchildPictureController.java | 12 +++++++++++- .../xiaoyao/ocr/thread/tasks/PictureDisposeTask.java | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java index f10513e2..2a3ad38c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java @@ -154,6 +154,10 @@ public class PictureSourceResult { */ Map productName; + /** + * 拜访部门 + */ + String companyDepartment; /** * 生产基地 */ diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java index 96de8ff7..b9b5ab43 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java @@ -80,11 +80,14 @@ public class PrevailCloudApiImpl implements PrevailCloudApi { //加密请求参数 String tenantNo = pictureSourceParameter.getTenantNo().toString(); String json = JSONObject.toJSONString(queryParam); + System.out.println(json); RequestData requestData = ApiHelper.buildRequest(tenantNo, apiConfig.getAccessKey(), apiConfig.getAccessCode(),json); //组装请求参数 String url = apiConfig.getInterfaceDomain()+pictureSourceUrl; String requestBodyJson = JSONObject.toJSONString(requestData); + //入参 + System.out.println("入参数据:"+requestBodyJson); HttpParamers httpParamers = new HttpParamers(HttpMethod.POST); httpParamers.setJsonParamer(requestBodyJson); //发起请求 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index bb4a3167..c2736857 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -131,7 +131,14 @@ public class OcrTaskchildPictureController extends BaseController { HttpServletResponse response, @PathVariable("packageid") String packageid, @PathVariable("taskchildpictureid") String taskchildpictureid) throws IOException { - + //获取页码、当前页 + String pageNoStr = request.getParameter("pageNo"); + String pageSizeStr = request.getParameter("pageSize"); + if(StringUtils.isEmpty(pageNoStr)|| StringUtils.isEmpty(pageSizeStr)){ + return ResultVoUtil.error("页码和条数必传！"); + } + paramterPage.setStart(Integer.parseInt(pageNoStr)); + paramterPage.setPagesize(Integer.parseInt(pageSizeStr)); //租户主键，由前端页面传送 String tenantId = request.getHeader("X-Tenant-Id"); if (StringUtils.isBlank(tenantId)) { @@ -148,6 +155,8 @@ public class OcrTaskchildPictureController extends BaseController { OcrTaskchildPicture ocrtaskchildpicture = new OcrTaskchildPicture(); QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery, ocrtaskchildpicture); + // + //queryWrapper.eq("TENANTID",tenantId); //queryWrapper.eq("PACKAGEID",packageid); @@ -156,6 +165,7 @@ public class OcrTaskchildPictureController extends BaseController { JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(p)); jsonObject.put("id", jsonObject.getOrDefault("id", null).toString()); jsonObject.put("tenantid", jsonObject.getOrDefault("tenantid", null).toString()); + jsonObject.put("pictureid", jsonObject.getOrDefault("pictureid", null).toString()); jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString()); return jsonObject; }).collect(Collectors.toList()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index c7fde59e..80212482 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java @@ -162,6 +162,8 @@ public class PictureDisposeTask implements Runnable{ picture.setField9(pictureSourceResult.getProductName().get("name").toString()); } } + //拜访科室 + picture.setField7(pictureSourceResult.getCompanyDepartment()); //生产基地 picture.setField5(pictureSourceResult.getManufacturer()); //拜访小结