From 2ec116944cbd4512d7db7c7f0d392cdba97efc3b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 1 Sep 2021 17:01:19 +0800 Subject: [PATCH 1/3] feat: There is no way the ocr handle url --- adc-da-main/src/main/resources/application-dev.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 8fbc7ffa..4afc5acb 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -12,7 +12,7 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem-w +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== @@ -65,7 +65,7 @@ file.path=/usr/laws/file/ #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = http://62.234.136.153:10010/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M From 3d5abafdb01d626abb9833b09f03061215a46f48 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 2 Sep 2021 10:43:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 6 +++--- .../impl/SarStandFileEOServiceImpl.java | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index b13dd512..d79f3beb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -168,9 +168,9 @@ public class ScheduledJob { - - - + /** + * 定时更新文本状态 + */ @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") @Async diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index ee9578a2..4e6217d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -66,9 +66,21 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { @Override public List selectFileByStandId(String standId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID",standId).groupBy("ORI_ATT_ID"); - return sarStandFileEODao.selectList(queryWrapper); + QueryWrapper queryWrapper= new QueryWrapper<>(); + + queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); + List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + + sarStandFileEOS.forEach(item->{ + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("ORI_ATT_ID",item.getOriAttId()) + .eq("USE_MODEL","SOURCE_FILE"); + SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper); + item.setFileOldName(sarStandFileEO.getFileName()); + }); + + return sarStandFileEOS; + // return sarStandFileEODao.selectFileByStandId(standId);r } From f8de6d895fad23af85b9c7dca5a57b5fdb00c8a9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 2 Sep 2021 15:21:45 +0800 Subject: [PATCH 3/3] feat: There is no way the --- .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index fcd59455..34216ab8 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -468,9 +468,9 @@ public class WorkFlowController { Page page= workFlowFeignClient.allProcess(taskCommonQuery); PageInfo pageInfo= new PageInfo(); pageInfo.setPageNo(taskCommonQuery.getCurrent()); - pageInfo.setList(page.getList()); - pageInfo.setCount(page.getCount()); - pageInfo.setPageSize(page.getPageSize()); + pageInfo.setList(page.getList() == null ? new ArrayList<>():page.getList()); + pageInfo.setCount(page.getCount() == null ? 0 : page.getCount()); + pageInfo.setPageSize(page.getPageSize() == null ? 0 : page.getPageSize()); return pageInfo; }