修改文件地址拼接

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java

@@ -64,35 +64,37 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
     public void excuteTask(ITask task) throws AppException {
         log.info("开始同步事项！");
         List<SiteEntity> siteEntities = siteService.find(new SiteEntity());
-        for (SiteEntity siteEntity : siteEntities) {
+        StopWatch stopWatch = new StopWatch("stopwatch syncmatter");
+        try {
+            for (SiteEntity siteEntity : siteEntities) {
+                log.info("开始同步站点部门==》{}", siteEntity.getSiteName());
+                stopWatch.start("开始同步站点部门");
+                deptService.syncDeptBySiteId(siteEntity, null);
+                stopWatch.stop();
+                log.info("同步站点部门完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
+                log.info("开始同步事项==》{}", siteEntity.getSiteName());
 
-            StopWatch stopWatch = new StopWatch("stopwatch syncmatter");
-            log.info("开始同步站点部门==》{}", siteEntity.getSiteName());
-            stopWatch.start("开始同步站点部门");
-            deptService.syncDeptBySiteId(siteEntity, null);
-            stopWatch.stop();
-            log.info("同步站点部门完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
-            log.info("开始同步事项==》{}", siteEntity.getSiteName());
+                stopWatch.start("开始同步事项方法");
+                matterExtService.doMatterBySiteId(siteEntity, null);
+                stopWatch.stop();
+                log.info("同步事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
 
-            stopWatch.start("开始同步事项方法");
-            matterExtService.doMatterBySiteId(siteEntity, null);
-            stopWatch.stop();
-            log.info("同步事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
+                log.info("开始添加站点事项==》{}", siteEntity.getSiteName());
+                stopWatch.start("开始添加站点事项");
+                siteMatterService.doSyncSiteMatter(siteEntity, null);
+                stopWatch.stop();
+                log.info("开始添加站点事项,耗时：{} s", stopWatch.getLastTaskTimeMillis() / 1000);
 
-            log.info("开始添加站点事项==》{}", siteEntity.getSiteName());
-            stopWatch.start("开始添加站点事项");
-            siteMatterService.doSyncSiteMatter(siteEntity, null);
-            stopWatch.stop();
-            log.info("开始添加站点事项,耗时：{} s", stopWatch.getLastTaskTimeMillis() / 1000);
-
-            //同步主题
-            stopWatch.start("开始同步主题事项");
-            matterExtService.doMatterThemeBySiteId(siteEntity, null);
-            stopWatch.stop();
-            log.info("同步主题事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
+                //同步主题
+                stopWatch.start("开始同步主题事项");
+                matterExtService.doMatterThemeBySiteId(siteEntity, null);
+                stopWatch.stop();
+                log.info("同步主题事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
+            }
+        } catch (Exception e) {
+            log.error("同步站点事项异常，站点:{}", siteEntities.get(0).getSiteName(), e);
         }
-        // syncDevice();
-        log.info("结束同步事项！");
+        log.info("结束同步事项！,耗时：{}秒", stopWatch.getLastTaskTimeMillis() / 1000);
     }
 
 

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

@@ -120,7 +120,10 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
                 matterEntity.setCreateTime(new Date());
                 matterEntity.setMatterEdition("0");
             }
-            matterService.save(subList, context);
+            List<List<MatterEntity>> partition = Lists.partition(subList, 100);
+            for (List<MatterEntity> partitionList : partition) {
+                matterService.save(partitionList, context);
+            }
             matterList = matterService.getDao().getMatterListByAreaCode(matterQuery.areaCode(siteEntity.getAreaCode()));
         }
         log.info("开始更新事项详细！");