Skip to content

S
sample-form-platform
Commit 877df31b authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

parents d31cf9ad a5aa5cc5
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 32 deletions
sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteMatterTaskImpl.java
View file @ 877df31b
...@@ -46,39 +46,50 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -46,39 +46,50 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
if (siteRest.getCode() == YesNoEnum.YES.getValue()) { if (siteRest.getCode() == YesNoEnum.YES.getValue()) {
log.info("总数量：{}",siteRest.getData().size()); log.info("总数量：{}",siteRest.getData().size());
siteRest.getData().forEach(site -> { siteRest.getData().forEach(site -> {
SiteMatterPdu siteMatterPdu = new SiteMatterPdu(); sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
siteMatterPdu.setPage(1); int page=100;
siteMatterPdu.setSize(-1); int pageNum=100;
Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu); for(int i=1;i<=page;i++){
if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) { SiteMatterPdu siteMatterPdu = new SiteMatterPdu();
//删除后新增 siteMatterPdu.setPage(i);
log.info("事项总数量：{}",siteMatterRest.getData().getData().size()); siteMatterPdu.setSize(pageNum);
List<SheetMatterEntity> sheetMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> { log.info("请求列表:"+i);
SheetMatterEntity sheetMatterEntity = new SheetMatterEntity(); Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu);
sheetMatterEntity.initAttrValue(); if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) {
sheetMatterEntity.setId(siteMatter.getMatterId()); if(siteMatterRest.getData().getData().size()==0){
sheetMatterEntity.setSiteId(siteMatter.getSiteId()); log.info("数据没有！跳出循环");
sheetMatterEntity.setMatterName(siteMatter.getMatterName()); break;
sheetMatterEntity.setMatterNo(siteMatter.getMatterCode()); }
sheetMatterEntity.setDeptCode(siteMatter.getDeptCode()); //删除后新增
sheetMatterEntity.setDeptName(siteMatter.getDeptName()); log.info("事项总数量：{}",siteMatterRest.getData().getData().size());
sheetMatterEntity.setAreaCode(siteMatter.getAreaCode()); List<SheetMatterEntity> sheetMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> {
sheetMatterEntity.setSource(siteMatter.getSource()); SheetMatterEntity sheetMatterEntity = new SheetMatterEntity();
return sheetMatterEntity; sheetMatterEntity.initAttrValue();
}).collect(Collectors.toList()); sheetMatterEntity.setId(siteMatter.getMatterId());
sheetMatterEntity.setSiteId(siteMatter.getSiteId());
sheetMatterEntity.setMatterName(siteMatter.getMatterName());
sheetMatterEntity.setMatterNo(siteMatter.getMatterCode());
sheetMatterEntity.setDeptCode(siteMatter.getDeptCode());
sheetMatterEntity.setDeptName(siteMatter.getDeptName());
sheetMatterEntity.setAreaCode(siteMatter.getAreaCode());
sheetMatterEntity.setSource(siteMatter.getSource());
return sheetMatterEntity;
}).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(sheetMatterEntities)) { if (!ObjectUtils.isEmpty(sheetMatterEntities)) {
sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId())); // sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
log.info("新增数量：{}",sheetMatterEntities.size()); log.info("新增数量：{}",sheetMatterEntities.size());
List<List<SheetMatterEntity>> partition = ListUtil.partition(sheetMatterEntities, 500); sheetMatterService.save(sheetMatterEntities);
for (List<SheetMatterEntity> matterEntities : partition) { /* List<List<SheetMatterEntity>> partition = ListUtil.partition(sheetMatterEntities, 500);
sheetMatterService.save(matterEntities); for (List<SheetMatterEntity> matterEntities : partition) {
} }*/
}
}else{
log.info("请求错误，code:{}",siteMatterRest.getCode());
}
}
}
}else{
log.info("请求错误，code:{}",siteMatterRest.getCode());
}
}); });
} }
} }
......
sample-form-manager/src/main/resources/bootstrap.yml
View file @ 877df31b
...@@ -13,7 +13,6 @@ spring: ...@@ -13,7 +13,6 @@ spring:
jackson: jackson:
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8 time-zone: GMT+8
cloud: cloud:
nacos: nacos:
# Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类 # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
...@@ -45,3 +44,10 @@ cookie: ...@@ -45,3 +44,10 @@ cookie:
port: 111 port: 111
token: token:
head: mortal head: mortal
hystrix:
command:
default:
execution:
isolation:
thread:
timeoutInMilliseconds: 60000
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment