From 426728c35963db0586724ecd85ddf24742646907 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Mon, 23 May 2022 14:37:00 +0800
Subject: [PATCH] =?UTF-8?q?update:=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B91.=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=AF=8F=E5=A4=A9?=
 =?UTF-8?q?=E5=87=8C=E6=99=A82=E7=82=B9=E6=89=A7=E8=A1=8C=20=202.=E5=B7=B2?=
 =?UTF-8?q?=E7=A6=BB=E8=81=8C=E7=94=A8=E6=88=B7=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/scheduled/ScheduledSync.java     | 4 ++--
 .../da/slrs/DataSync/service/impl/DataSyncServiceImpl.java    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java
index fa2fed00..14248747 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java
@@ -23,8 +23,8 @@ public class ScheduledSync {
     private IDataSyncService iDataSyncService;
 
 
-//    @Scheduled(cron = "0 */40 * * * ?")    //40分钟执行同步一次
-//    @Scheduled(cron="*/5 * * * * ?")
+    //每天凌晨两点执行
+    @Scheduled(cron="0 0 2 * * ?")
 
     @Async
     public void syncSchedulingTasks() throws Exception {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
index 501ddc10..74c1c951 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
@@ -95,7 +95,8 @@ public class DataSyncServiceImpl implements IDataSyncService {
                 tsUser.setAccount(jsonObject.getString("userid"));
                 tsUser.setInstitutionId(null!=jsonObject.getString("orgNumber")?jsonObject.getString("orgNumber"):"" );
                 tsUser.setInstitutionName(null!=jsonObject.getString("orgName")?jsonObject.getString("orgName"):"" );
-                if (null == useDistinct.get(jsonObject.getString("userid"))) {
+                //2022-05-23：用户同步增加状态标识，将停用的用户过滤掉
+                if (null == useDistinct.get(jsonObject.getString("userid")) && "1".equals(jsonObject.getString("userStatus"))) {
                     tsUsers.add(tsUser);
 
                 }