FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_1

Browse Source
This commit is contained in:
Mr.Z
2021-09-02 16:49:29 +08:00
parent 2e6edf615b 5c246ba9b4
commit 7d0c3a3a9a
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+3 -3
View File
@@ -468,9 +468,9 @@ public class WorkFlowController {
Page page= workFlowFeignClient.allProcess(taskCommonQuery); Page page= workFlowFeignClient.allProcess(taskCommonQuery);
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>(); PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setList(page.getList()); pageInfo.setList(page.getList() == null ? new ArrayList<>():page.getList());
pageInfo.setCount(page.getCount()); pageInfo.setCount(page.getCount() == null ? 0 : page.getCount());
pageInfo.setPageSize(page.getPageSize()); pageInfo.setPageSize(page.getPageSize() == null ? 0 : page.getPageSize());
return pageInfo; return pageInfo;
} }
adc-da-main/src/main/resources/application-dev.properties
+2 -2
View File
@@ -12,7 +12,7 @@ spring.datasource.password = root
#============================================== #==============================================
# 应用设置 # 应用设置
spring.application.name=FotonLAWSSystem-w spring.application.name=FotonLAWSSystem
application.code=20200101 application.code=20200101
application.center=1 application.center=1
#============================================== #==============================================
@@ -65,7 +65,7 @@ file.path=/usr/laws/file/
#OCR请求识别URL地址 #OCR请求识别URL地址
OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion
# OCR回调接口地址 配置客户本地的IP及端口号 # 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.userId =dayuzhou1234
OCR.authCode =123456 OCR.authCode =123456
OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+3 -3
View File
@@ -170,9 +170,9 @@ public class ScheduledJob {
/**
* 定时更新文本状态
*/
@Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
// @Scheduled(cron="*/5 * * * * ?") // @Scheduled(cron="*/5 * * * * ?")
@Async @Async
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+15 -3
View File
@@ -66,9 +66,21 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
@Override @Override
public List<SarStandFileEO> selectFileByStandId(String standId) { public List<SarStandFileEO> selectFileByStandId(String standId) {
QueryWrapper<SarStandFileEO> queryWrapper = new QueryWrapper<>(); QueryWrapper<SarStandFileEO> queryWrapper= new QueryWrapper<>();
queryWrapper.eq("STAND_ID",standId).groupBy("ORI_ATT_ID");
return sarStandFileEODao.selectList(queryWrapper); queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE");
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
sarStandFileEOS.forEach(item->{
QueryWrapper<SarStandFileEO> 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 // return sarStandFileEODao.selectFileByStandId(standId);r
} }