From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/server/DataSync/service/DataSyncService.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 df6ec49..51348b7 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,13 +63,15 @@
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");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ String outputZipPath = showSaveFileDialog(dateFormat.format(new Date()) + mySite + "鍚屾鏁版嵁鍖�.zip");
if (outputZipPath == null) {
- massage[0] = "鐢ㄦ埛鍙栨秷淇濆瓨锛岀▼搴忛��鍑恒��"+ new Date();
+ massage[0] = "鐢ㄦ埛鍙栨秷淇濆瓨锛岀▼搴忛��鍑恒��" + new Date();
tips.setText(tips.getText() + massage[0]);
} else {
final WaitUtil waitUtil = new WaitUtil(imgPath, "鏁版嵁姝ｅ湪瀵煎叆锛岃绋嶅��");
@@ -154,6 +156,9 @@
Path sourceDir = Paths.get(UnzipPath + "life-protection");
Path targetDir = Paths.get(localPath + "life-protection");
+ if (!Files.exists(sourceDir)) {
+ Files.createDirectories(sourceDir);
+ }
// 濡傛灉鐩爣鏂囦欢澶逛笉瀛樺湪锛屽垱寤哄畠
if (!Files.exists(targetDir)) {
Files.createDirectories(targetDir);
@@ -171,23 +176,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");
@@ -213,9 +232,10 @@
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();
+ ImportRecord data = new ImportRecord();
data.setImportSite(otherSite);
importRecordDao.insert(data);
List<ImportRecord> list = importRecordDao.getList();
--
Gitblit v1.9.1