From af67fb927c3f30fa70df834f0e97f0b4a91e6119 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 10 四月 2025 14:58:22 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/server/DataSync/service/DataSyncService.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/server/DataSync/service/DataSyncService.java b/src/main/java/com/example/server/DataSync/service/DataSyncService.java
index 3a6f4a8..029b576 100644
--- a/src/main/java/com/example/server/DataSync/service/DataSyncService.java
+++ b/src/main/java/com/example/server/DataSync/service/DataSyncService.java
@@ -11,7 +11,7 @@
 import com.example.server.progressTrack.dao.ImportRecordDao;
 import com.example.server.progressTrack.model.ExportRecord;
 import com.example.server.progressTrack.model.ImportRecord;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -63,7 +63,7 @@
         String configPath = configPath2;
         String directoryPath = localPath + "life-protection";
 
-        String mySite = (String) CacheUtils.get("site", "site");
+        String mySite = (String) UserAndSiteUtils.get("site", "site");
 
         // 寮瑰嚭鏂囦欢閫夋嫨妗嗭紝璁╃敤鎴烽�夋嫨淇濆瓨ZIP鏂囦欢鐨勮矾寰�
         String outputZipPath = showSaveFileDialog(mySite + "鍚屾鏁版嵁鍖�.zip");
@@ -171,23 +171,37 @@
             e.printStackTrace();
         }
 
-        String mySite = (String) CacheUtils.get("site", "site");
+        String mySite = (String) UserAndSiteUtils.get("site", "site");
         String otherSite = properties.get("site").toString();
         if ("宸ヤ綔缁�".equals(mySite)) {
+            syncTable("dj_jdgz_network_level1");
+            syncTable("dj_jdgz_network_level1_list");
+            syncTable("dj_jdgz_network_level2");
+            syncTable("dj_jdgz_network_level2_list");
             syncTable("dj_jdgz_handover");
             syncTable("dj_jdgz_network_level3");
             syncTable("dj_jdgz_network_level3_list");
             syncTable("dj_jdgz_track_record");
             syncTable("dj_sys_oss");
+            syncTable("dj_sys_teamgroup_class");
+            syncTable("sys_user");
             syncTable("dj_jdgz_dismant_track");
+            syncTable("dj_jdgz_ship");
         } else if (mySite.equals("TD")) {
             if (otherSite.equals("TD")) {
+                syncTable("dj_jdgz_network_level1");
+                syncTable("dj_jdgz_network_level1_list");
+                syncTable("dj_jdgz_network_level2");
+                syncTable("dj_jdgz_network_level2_list");
                 syncTable("dj_jdgz_network_level3");
                 syncTable("dj_jdgz_network_level3_list");
                 syncTable("dj_jdgz_track_record");
                 syncTable("dj_sys_oss");
                 syncTable("dj_jdgz_dismant_track");
                 syncTable("dj_jdgz_handover");
+                syncTable("dj_sys_teamgroup_class");
+                syncTable("sys_user");
+                syncTable("dj_jdgz_ship");
             } else if ("宸ヤ綔缁�".equals(otherSite)) {
                 syncTable("dj_jdgz_handover");
                 syncTable("dj_jdgz_network_level1");
@@ -201,6 +215,7 @@
                 syncTable("dj_jdgz_dismant_track");
                 syncTable("dj_sys_teamgroup_class");
                 syncTable("sys_user");
+                syncTable("dj_jdgz_ship");
             }
         } else if ("鍘傚".equals(mySite)) {
             syncTable("dj_jdgz_handover");
@@ -212,6 +227,7 @@
             syncTable("dj_jdgz_network_level3_list");
             syncTable("dj_jdgz_track_record");
             syncTable("dj_sys_oss");
+            syncTable("dj_jdgz_ship");
             syncTable("dj_jdgz_dismant_track");
         }
         ImportRecord data =new ImportRecord();

--
Gitblit v1.9.1