优化站点同步事项

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java

@@ -76,7 +76,7 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
     @Override
     public Rest<String> doMatterBySiteId(SiteEntity siteEntity, Context context) {
         AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode());
-       // List<MatterEntity> govMatterList = new ArrayList<>();
+        // List<MatterEntity> govMatterList = new ArrayList<>();
         List<DeptEntity> deptEntities = deptService.find(new DeptQuery().siteId(siteEntity.getId()).source(SourceEnum.政务网.getValue()));
 
         List<MatterEntity> govMatterList = deptEntities.parallelStream().flatMap(deptEntity -> {
@@ -103,8 +103,12 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
         }*/
         //当前本地区事项全部事项
         log.info("计算差集");
-        List<MatterEntity> matterList = matterService.getDao().getMatterListByAreaCode(new MatterQuery().areaCode(siteEntity.getAreaCode()).source(SourceEnum.政务网.getValue()));
-        Set<String> matterNoSet =matterList.parallelStream().map(i -> i.getMatterNo()).collect(Collectors.toSet());
+        MatterQuery matterQuery = new MatterQuery();
+        matterQuery.setAreaCode(siteEntity.getAreaCode());
+        matterQuery.setSource(SourceEnum.政务网.getValue());
+        List<MatterEntity> matterList = matterService.getDao().getMatterListByAreaCode(matterQuery);
+        log.info("本地事项总数：{}", matterList.size());
+        Set<String> matterNoSet = matterList.parallelStream().map(i -> i.getMatterNo()).collect(Collectors.toSet());
         List<MatterEntity> subList = this.subListSet(govMatterList, matterNoSet);
         subList = subList.parallelStream().distinct().collect(Collectors.toList());
         log.info("抓取事项总数：{} 需要添加事项数量：{}", govMatterList.size(), subList.size());
@@ -118,19 +122,19 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
                 matterEntity.setMatterEdition("0");
             }
             matterService.save(subList, context);
-            matterList = matterService.getDao().getMatterListByAreaCode(new MatterQuery().areaCode(siteEntity.getAreaCode()));
+            matterList = matterService.getDao().getMatterListByAreaCode(matterQuery.areaCode(siteEntity.getAreaCode()));
         }
 
         for (MatterEntity matterEntity : matterList) {
             Rest<String> rest = matterService.buildMatterDetail(matterEntity, null);
-            if(rest.getCode()==YesNoEnum.YES.getValue()){
+            if (rest.getCode() == YesNoEnum.YES.getValue()) {
                 matterEntity.setUpdateTime(new Date());
                 matterService.update(matterEntity, null);
             }
         }
 
 
-    //    Rest<String> syncSiteMatterRest = siteMatterService.doSyncSiteMatter(siteEntity, context);
+        //    Rest<String> syncSiteMatterRest = siteMatterService.doSyncSiteMatter(siteEntity, context);
 
   /*      //查询站点事项相关
         List<SiteEntity> siteEntities = siteService.find(new SiteQuery().areaCode(siteEntity.getAreaCode()));