From 5e4cd7c4251b45d56ac271e12f56d398bb6f65c2 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Wed, 15 May 2024 13:43:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/ApiTestController.java | 24 ++++++++++++++++++- .../xiaoyao/ocr/dataobject/OcrFrontConf.java | 5 ++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java index 206d5f1e..becb8466 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java @@ -56,6 +56,28 @@ public class ApiTestController { @Resource private OcrPictureService ocrPictureService; + /** + * 拉取无量云全量任务数据，根据业务主体 + * @param request + * @return + */ + @GetMapping("pullPictureAllByAccountNo") + public String pullPictureAllByAccountNo(HttpServletRequest request){ + String beginStr = request.getParameter("beginStr"); + String endStr = request.getParameter("endStr"); + String tenantNoStr = request.getParameter("tenantNo"); + if(StringUtils.isBlank(tenantNoStr)){ + return "租户不能为空"; + } + String accountNoStr = request.getParameter("accountNo"); + if(StringUtils.isBlank(accountNoStr)){ + return "业务主体不能为空"; + } + Long tenantNo = Long.parseLong(request.getParameter("tenantNo")); + Long accountNo = Long.parseLong(request.getParameter("accountNo")); + return ""; + } + /** * 拉取无量云任务数据，根据单租户、业务主体拉取 * pull wyl task data @@ -83,7 +105,7 @@ public class ApiTestController { DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss"); // DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss"); Instant binstant = dateTime.toInstant(); - DateTime dateTime1 = DateUtil.parse(endStr+" 00:00:00","yyyy-MM-dd HH:mm:ss"); + DateTime dateTime1 = DateUtil.parse(endStr+" 23:59:59","yyyy-MM-dd HH:mm:ss"); // DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss"); Instant einstant = dateTime1.toInstant(); pictureSourceParameter.setStartTime(Date.from(binstant)); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java index bfcaf6c6..ff000713 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java @@ -63,4 +63,9 @@ public class OcrFrontConf implements java.io.Serializable { * 默认图片 */ private String defaultPictureImg; + + /** + * 拉取全量接口数据 + */ + private String pictureSourceAllUrl; } From bb7bb072f23b9e72cbac85b05c48346eadbfe7ed Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Wed, 15 May 2024 15:54:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E9=87=8D=E6=8F=90=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BB=BB=E5=8A=A1=E5=8C=85=E7=9B=B8=E5=85=B3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OcrPictureServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index a5922547..e0e6d381 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -561,21 +561,21 @@ public class OcrPictureServiceImpl extends BaseServiceImpl().eq(OcrPictureDuplicateHis::getPictureId, id)); } - //查重结果 - OcrCheckDuplicateResult duplicateResult = ocrCheckDuplicateResultService.getOne(new LambdaQueryWrapper().eq(OcrCheckDuplicateResult::getPictureId, id)); - String compareResultJson = duplicateResult.getCompareResultJson(); - if (StringUtils.isNotBlank(compareResultJson)) { - JSONObject jsonObject = JSON.parseObject(compareResultJson); - Set keyList = jsonObject.keySet(); - List list = ocrCheckDuplicateResultService.list(new LambdaQueryWrapper().in(OcrCheckDuplicateResult::getPictureId, keyList)); - for (OcrCheckDuplicateResult checkDuplicateResult : list) { - String resultCompareResultJson = checkDuplicateResult.getCompareResultJson(); - JSONObject json = JSON.parseObject(resultCompareResultJson); - json.remove(id.toString()); - checkDuplicateResult.setCompareResultJson(JSON.toJSONString(json)); - } - ocrCheckDuplicateResultService.updateBatchById(list); - } + //删除任务包,查重结果 +// OcrCheckDuplicateResult duplicateResult = ocrCheckDuplicateResultService.getOne(new LambdaQueryWrapper().eq(OcrCheckDuplicateResult::getPictureId, id)); +// String compareResultJson = duplicateResult.getCompareResultJson(); +// if (StringUtils.isNotBlank(compareResultJson)) { +// JSONObject jsonObject = JSON.parseObject(compareResultJson); +// Set keyList = jsonObject.keySet(); +// List list = ocrCheckDuplicateResultService.list(new LambdaQueryWrapper().in(OcrCheckDuplicateResult::getPictureId, keyList)); +// for (OcrCheckDuplicateResult checkDuplicateResult : list) { +// String resultCompareResultJson = checkDuplicateResult.getCompareResultJson(); +// JSONObject json = JSON.parseObject(resultCompareResultJson); +// json.remove(id.toString()); +// checkDuplicateResult.setCompareResultJson(JSON.toJSONString(json)); +// } +// ocrCheckDuplicateResultService.updateBatchById(list); +// } ocrCheckDuplicateResultService.remove(new LambdaQueryWrapper().eq(OcrCheckDuplicateResult::getPictureId, id)); } From d4bc397c8bbc7b5c4aca8db72c12ae6367d3493d Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Wed, 15 May 2024 16:47:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8C=85=E6=89=80=E6=9C=89=E4=BB=BB=E5=8A=A1=E9=83=BD=E8=A2=AB?= =?UTF-8?q?=E9=87=8D=E6=8F=90=E5=90=8E=EF=BC=8C=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index e0e6d381..20982477 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -332,6 +332,9 @@ public class OcrPictureServiceImpl extends BaseServiceImpl().eq(OcrPictureInfo::getPictureId, ocrPicture.getId())); ocrPicture.setPictureInfo(one); if (ObjectUtil.isNotEmpty(one)) {