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

sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteMatterTaskImpl.java

@@ -46,39 +46,50 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
         if (siteRest.getCode() == YesNoEnum.YES.getValue()) {
             log.info("总数量：{}",siteRest.getData().size());
             siteRest.getData().forEach(site -> {
-                SiteMatterPdu siteMatterPdu = new SiteMatterPdu();
-                siteMatterPdu.setPage(1);
-                siteMatterPdu.setSize(-1);
-                Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu);
-                if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) {
-                    //删除后新增
-                    log.info("事项总数量：{}",siteMatterRest.getData().getData().size());
-                    List<SheetMatterEntity> sheetMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> {
-                        SheetMatterEntity sheetMatterEntity = new SheetMatterEntity();
-                        sheetMatterEntity.initAttrValue();
-                        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());
+                sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
+                int page=100;
+               int pageNum=100;
+               for(int i=1;i<=page;i++){
+                   SiteMatterPdu siteMatterPdu = new SiteMatterPdu();
+                   siteMatterPdu.setPage(i);
+                   siteMatterPdu.setSize(pageNum);
+                   log.info("请求列表:"+i);
+                   Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu);
+                   if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) {
+                       if(siteMatterRest.getData().getData().size()==0){
+                           log.info("数据没有！跳出循环");
+                           break;
+                       }
+                       //删除后新增
+                       log.info("事项总数量：{}",siteMatterRest.getData().getData().size());
+                       List<SheetMatterEntity> sheetMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> {
+                           SheetMatterEntity sheetMatterEntity = new SheetMatterEntity();
+                           sheetMatterEntity.initAttrValue();
+                           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)) {
-                        sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
-                        log.info("新增数量：{}",sheetMatterEntities.size());
-                        List<List<SheetMatterEntity>> partition = ListUtil.partition(sheetMatterEntities, 500);
-                        for (List<SheetMatterEntity> matterEntities : partition) {
-                            sheetMatterService.save(matterEntities);
-                        }
+                       if (!ObjectUtils.isEmpty(sheetMatterEntities)) {
+                          // sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
+                           log.info("新增数量：{}",sheetMatterEntities.size());
+                           sheetMatterService.save(sheetMatterEntities);
+                  /*         List<List<SheetMatterEntity>> partition = ListUtil.partition(sheetMatterEntities, 500);
+                           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

@@ -13,7 +13,6 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-
   cloud:
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
@@ -45,3 +44,10 @@ cookie:
   port: 111
 token:
   head: mortal
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000