修改文件地址拼接

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

@@ -28,6 +28,7 @@ import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.site.service.SiteThemeMatterService;
 import com.mortals.xhx.module.site.service.SiteThemeService;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -49,12 +50,14 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
 
     @Autowired
     private SiteService siteService;
-    
+
     @Autowired
     private SiteMatterService siteMatterService;
 
     @Autowired
     private MatterExtService matterExtService;
+    @Autowired
+    private DeptService deptService;
 
 
     @Override
@@ -62,19 +65,31 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
         log.info("开始同步事项！");
         List<SiteEntity> siteEntities = siteService.find(new SiteEntity());
         for (SiteEntity siteEntity : siteEntities) {
+
             StopWatch stopWatch = new StopWatch("stopwatch syncmatter");
-            log.info("开始同步事项==》{}",siteEntity.getSiteName());
+            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);
+            matterExtService.doMatterBySiteId(siteEntity, null);
             stopWatch.stop();
-            log.info("同步事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis()/1000);
+            log.info("同步事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
 
-            log.info("开始添加站点事项==》{}",siteEntity.getSiteName());
+            log.info("开始添加站点事项==》{}", siteEntity.getSiteName());
             stopWatch.start("开始添加站点事项");
             siteMatterService.doSyncSiteMatter(siteEntity, null);
             stopWatch.stop();
-            log.info("开始添加站点事项,耗时：{} s", stopWatch.getLastTaskTimeMillis()/1000);
-           // syncMatter(siteEntity);
+            log.info("开始添加站点事项,耗时：{} s", stopWatch.getLastTaskTimeMillis() / 1000);
+
+            //同步主题
+            stopWatch.start("开始同步主题事项");
+            matterExtService.doMatterThemeBySiteId(siteEntity, null);
+            stopWatch.stop();
+            log.info("同步主题事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis() / 1000);
         }
         // syncDevice();
         log.info("结束同步事项！");