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; } 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 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 462f8ad9..6664c6bb 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 @@ -170,9 +170,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 }