diff --git a/base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java b/base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java index ec23d7399c7588748972396285634c9461a8a6e4..4efcc3b7eeb0183daf16fa94a0e49ee653f73212 100644 --- a/base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java +++ b/base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java @@ -69,15 +69,17 @@ public class SyncGovMatterDetailThread implements Runnable { @Override public void run() { log.info("鍚屾绔欑偣浜嬮」寮€濮�....."); - // Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity, context); - // log.info("鍚屾绔欑偣閮ㄩ棬:" + JSON.toJSONString(deptRest)); + Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity, context); + log.info("鍚屾绔欑偣閮ㄩ棬:" + JSON.toJSONString(deptRest)); Rest<String> rest = siteService.syncMatterBySiteId(siteEntity, context); + // Rest<String> rest = Rest.ok(); + AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode()); log.info("鍚屾浜嬮」鍒楄〃:" + JSON.toJSONString(rest)); if (rest.getCode() == YesNoEnum.YES.getValue()) { List<MatterEntity> matterEntityList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()).source(SourceEnum.鏀垮姟缃�.getValue())); List<MatterEntity> unSyncDetailMatterList = matterEntityList.stream() - //.filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false")) + .filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false")) .collect(Collectors.toList()); //鏌ヨ绔欑偣浜嬮」鐩稿叧 @@ -88,7 +90,7 @@ public class SyncGovMatterDetailThread implements Runnable { }*/ //閲嶆柊娣诲姞 - if (ObjectUtils.isEmpty(siteEntities)) { + if (!ObjectUtils.isEmpty(siteEntities)) { log.info("鍚屾绔欑偣浜嬮」鍒扮珯鐐�....."); for (SiteEntity site : siteEntities) { List<SiteMatterEntity> siteMatterList = matterEntityList.stream().map(item -> { diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java index 80b7291c18010e149554f34783b9339cc933602e..5ec3d1cdab6997f9e5e9d6e5c22c91c54473ff8e 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java @@ -117,6 +117,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem return siteThemeMatterEntity; }).collect(Collectors.toList()); if (!ObjectUtils.isEmpty(collect)) { + log.info("淇濆瓨鏁伴噺锛�"+collect.size()); this.save(collect, context); } } diff --git a/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http b/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http index a1a1a2bcf9b0fb7c669923d6a5e280c9cd7112cd..ef22ac9e6fd93fe092f0a87f3e941a6ab4036c98 100644 --- a/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http +++ b/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http @@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName Content-Type: application/json { - "areaCode": "510100000000" + "areaCode": "510700000000" } diff --git a/base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http b/base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http index 269bf3870768fd5b9c37d2b2c3ca211001db9949..836da341b27efbce041513948ada4b25bcb86d23 100644 --- a/base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http +++ b/base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http @@ -97,7 +97,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId Content-Type: application/json { - "id":1 + "id":2 }