From 067bc414a3a87eb151bbdde3407f48302e11f98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Wed, 29 Mar 2023 21:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=A4=8D?=
=?UTF-8?q?=E9=80=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/common/utils/SyncGovMatterDetailThread.java | 10 ++++++----
.../site/service/impl/SiteThemeMatterServiceImpl.java | 1 +
.../mortals/httpclient/base/BaseAreaController.http | 2 +-
.../com/mortals/httpclient/site/SiteController.http | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
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 ec23d739..4efcc3b7 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 80b7291c..5ec3d1cd 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 a1a1a2bc..ef22ac9e 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 269bf387..836da341 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
}
--
2.24.3