diff --git a/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java b/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java index 6065d90a52acb3b7f3b4d93eada9708ec9833772..dbcb82ca02b92e4d8318154d4e9b544446f29042 100644 --- a/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java +++ b/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("缁撴潫鍚屾浜嬮」锛�");