From 3dfa30514b8cc7be2bbfb27b03fb69f146368cdd Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 5 Sep 2024 11:33:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0=20-=20?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E6=95=B0=E6=8D=AE=E6=97=B6=E4=B8=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9C=AC=E5=9C=B0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/syncData/SyncDataAdviceAspect.java |  1 +
 .../syncData/listener/SyncDataListener.java   | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java b/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java
index 2acaf8ab..d50553f2 100644
--- a/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java
+++ b/src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java
@@ -27,6 +27,7 @@ import java.util.Map;
  */
 @Aspect
 @Component
+@SuppressWarnings("all")
 public class SyncDataAdviceAspect {
 
     @Pointcut(value = "@annotation(com.zcloud.syncData.SyncPlatformAdvice)")
diff --git a/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java b/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java
index 93c6b1b2..a313f873 100644
--- a/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java
+++ b/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java
@@ -33,6 +33,7 @@ import java.util.Date;
         topic = "${mq.consumer.dataChange.tongbu-data-change.topic}",
         selectorType = SelectorType.TAG,
         messageModel = MessageModel.BROADCASTING) // 添加广播模式
+@SuppressWarnings("all")
 public class SyncDataListener implements RocketMQListener<String> {
 
     @Autowired
@@ -102,10 +103,10 @@ public class SyncDataListener implements RocketMQListener<String> {
                     // 相关方推送
                     xgfUserService.edit4Mq(syncInfo);
                 }
-                PageData localData = usersService.findById(syncInfo);
-                if (localData != null && !localData.isEmpty()){
-                    usersService.editUser(syncInfo);
-                }
+//                PageData localData = usersService.findById(syncInfo);
+//                if (localData != null && !localData.isEmpty()){
+//                    usersService.editUser(syncInfo);
+//                }
 
                 // 2024.8.9 按郭跃鹏提出：后期各公司从企业端分离后，需要其他公司的用户进行SQL联查，要求新增一张core_user的同步表，用于记录中台的所有用户数据
                 PageData coreLocalData = coreSyncUserMapper.findById(syncInfo);
@@ -134,9 +135,9 @@ public class SyncDataListener implements RocketMQListener<String> {
                 String str = tenCorpDto.getData().getString("syncInfo");
                 PageData syncInfo = JSONUtil.toBean(str, PageData.class);
                 PageData localData = departmentMapper.findById(syncInfo);
-                if (localData != null && !localData.isEmpty()){
-                    departmentMapper.edit(syncInfo);
-                }
+//                if (localData != null && !localData.isEmpty()){
+//                    departmentMapper.edit(syncInfo);
+//                }
 
                 PageData coreLocalData = coreSyncDeptMapper.findById(syncInfo);
                 try {
@@ -161,9 +162,9 @@ public class SyncDataListener implements RocketMQListener<String> {
                 String str = tenCorpDto.getData().getString("syncInfo");
                 PageData syncInfo = JSONUtil.toBean(str, PageData.class);
                 PageData localData = corpinfoMapper.findById(syncInfo);
-                if (localData != null && !localData.isEmpty()){
-                    corpinfoMapper.edit(syncInfo);
-                }
+//                if (localData != null && !localData.isEmpty()){
+//                    corpinfoMapper.edit(syncInfo);
+//                }
 
                 PageData coreLocalData = coreSyncCorpMapper.findById(syncInfo);
                 try {