From 60a3f2bc64b7a5f502e4133ced31f0b25c88d3f1 Mon Sep 17 00:00:00 2001
From: Hunter0x7c7 <1125607007@qq.com>
Date: 星期四, 12 九月 2024 14:57:03 +0800
Subject: [PATCH] 版本v1.0.2(3)发布。
---
src/main/java/com/github/hunter0x7c7/sync/ctrls/Controller.java | 214 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 146 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/github/hunter0x7c7/sync/ctrls/Controller.java b/src/main/java/com/github/hunter0x7c7/sync/ctrls/Controller.java
index d3eb8d5..c2d1428 100644
--- a/src/main/java/com/github/hunter0x7c7/sync/ctrls/Controller.java
+++ b/src/main/java/com/github/hunter0x7c7/sync/ctrls/Controller.java
@@ -16,6 +16,8 @@
import io.reactivex.functions.Predicate;
import io.reactivex.schedulers.Schedulers;
import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
@@ -48,21 +50,37 @@
import static com.github.hunter0x7c7.sync.model.global.Parameters.*;
public class Controller {
- public static final String SQL1_QUERY = "SELECT * FROM IOT_Equipment_Info WHERE IE_Type = 'XPH鐗╄仈缃戝叧'; ";
- public static final String SQL2_QUERY = "SELECT SD_Addr + '|' + SD_Code IE_Param, * " +
- "FROM TY_SensorData WHERE SD_Key IN ( '%s' );";
- public static final String SQL3_UPDATE = "UPDATE IOT_Equipment_Info " +
+ //1. 鍦ㄧ洰鏍囧簱锛屾妸閲囬泦绫荤綉鍏宠澶囧厛鎵惧嚭鏉�
+ public static final String SQL_QUERY_TARGET = "SELECT * " +
+ "FROM IOT_Equipment_Info " +
+ "WHERE IE_Type = '鐗╄仈缃戝叧' " +
+ "OR IE_Type = 'XPH缃戝叧' " +
+ "OR IE_Type = 'XPH鐗╄仈缃戝叧' " +
+ "OR IE_Type = '姘旇薄绔欑綉鍏�' " +
+ "OR IE_Type = '閲囬泦鐗╄仈缃戝叧' " +//娓╁閲囬泦鏈烘煖
+ "OR IE_Type = '铏儏鐩戞祴缃戝叧' " +
+ "OR IE_Type = '澧掓儏缃戝叧' " +
+ "OR IE_Type = '杩滀紶姘磋〃'; ";
+
+ //2. 鍦ㄦ簮鏁版嵁搴擄紝鎶婄浉鍏崇綉鍏宠澶囩殑瀛愯鏌ユ壘鍑烘潵锛屾嫾鎺ュソParam鍙傛暟00|01
+ public static final String SQL_QUERY_SRC = "SELECT SD_Addr + '|' + SD_Code IE_Param, * " +
+ "FROM TY_SensorData " +
+ "WHERE SD_Key IN ( '%s' ); ";
+ //3. 鍦ㄧ洰鏍囧簱锛屾妸鍖归厤鐨勬渶鏂版暟鎹洿鏂板埌鐩稿叧鐨勮涓�
+ public static final String SQL_UPDATE_TARGET = "UPDATE IOT_Equipment_Info " +
"SET IE_Realtime_Data = ?, IE_Realtime_Time = ?, Edit_User = ?, Edit_Time = ? " +
- "WHERE IE_Param = ? AND IE_Parent = ( " +
- "SELECT IE_ID FROM IOT_Equipment_Info WHERE IE_Param = ? " +
- ") ;";
+ "WHERE IE_Param = ? " +
+ "AND IE_Parent IN ( " +
+ "SELECT IE_ID " +
+ "FROM IOT_Equipment_Info " +
+ "WHERE IE_Param = ? ) ;";
@FXML
private TextField tvInputSrcHost;
@FXML
private TextField tvInputSrcName;
@FXML
- private PasswordField tvInputSrcPwd;
+ private TextField tvInputSrcPwd;
@FXML
private TextField tvInputSrcDbName;
@@ -71,7 +89,7 @@
@FXML
private TextField tvInputTargetName;
@FXML
- private PasswordField tvInputTargetPwd;
+ private TextField tvInputTargetPwd;
@FXML
private TextField tvInputTargetDbName;
@FXML
@@ -100,7 +118,12 @@
private CompositeDisposable mCompositeDisposable;
//鍚屾棰戠巼鍗曚綅鍒楄〃
- private static final TimeUnit[] mFreqUnitList = {TimeUnit.MILLISECONDS, TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS};
+ private static final TimeUnit[] mFreqUnitList = {
+ TimeUnit.MILLISECONDS,
+ TimeUnit.SECONDS,
+ TimeUnit.MINUTES,
+ TimeUnit.HOURS,
+ TimeUnit.DAYS};
//鍚屾棰戠巼鍗曚綅鍚嶇О鍒楄〃
private static final String[] mFreqNameList = {"姣", "绉�", "鍒嗛挓", "灏忔椂", "澶�"};
//鍚屾娆℃暟
@@ -186,7 +209,13 @@
show.addActionListener(actionListener -> {
Platform.runLater(() -> {
if (primaryStage != null) {
- primaryStage.show();
+ if (primaryStage.isIconified()) {//鏈�灏忓寲
+ primaryStage.setIconified(false);
+ }
+ if (!primaryStage.isShowing()) {
+ primaryStage.show();
+ }
+ primaryStage.toFront();
}
});
});
@@ -200,6 +229,21 @@
};
//娣诲姞鍒扮郴缁熸墭鐩�
TrayUtil.getInstance().addSystemTray(primaryStage, AppName_zh_rCN, mipmap, callback, show);
+
+ //鏈�灏忓寲涔嬪悗锛屽叧闂獥鍙�
+ primaryStage.iconifiedProperty().addListener(new ChangeListener<Boolean>() {
+ @Override
+ public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+ //濡傛灉浣犳墽琛屼簡setIconified(true)涔嬪悗鍐嶆墽琛宧ide(),
+ // stage浼氳閿�姣�,鍥犳闇�瑕佸湪绐楀彛鍏抽棴鍓嶅皢Iconified璁句负false
+ if (!oldValue && newValue) {
+ //鏈�灏忓寲涔嬪悗锛屽叧闂獥鍙�
+ if (primaryStage != null) {
+ primaryStage.close();
+ }
+ }
+ }
+ });
}
}).concatMap(new Function<Object, Observable<ConfigBean>>() {//鍑嗗鍒濆鍖栫殑閰嶇疆鏁版嵁
@Override
@@ -217,6 +261,9 @@
}).map(new Function<Boolean, ConfigBean>() {
@Override
public ConfigBean apply(Boolean aBoolean) throws Exception {
+ assert configBean != null;
+ configBean.setSrcPwd(getDecryptData(configBean.getSrcPwd()));
+ configBean.setTargetPwd(getDecryptData(configBean.getTargetPwd()));
return configBean;
}
}).switchIfEmpty(new Observable<ConfigBean>() {
@@ -270,11 +317,11 @@
//鏇存柊鐣岄潰鏁版嵁
setInputText(tvInputSrcHost, cb.getSrcHost());
setInputText(tvInputSrcName, cb.getSrcName());
- setInputText(tvInputSrcPwd, getDecryptData(cb.getSrcPwd()));
+ setInputText(tvInputSrcPwd, cb.getSrcPwd());
setInputText(tvInputSrcDbName, cb.getSrcDbName());
setInputText(tvInputTargetHost, cb.getTargetHost());
setInputText(tvInputTargetName, cb.getTargetName());
- setInputText(tvInputTargetPwd, getDecryptData(cb.getTargetPwd()));
+ setInputText(tvInputTargetPwd, cb.getTargetPwd());
setInputText(tvInputTargetDbName, cb.getTargetDbName());
setInputText(tvInputFreq, cb.getFreqValue());
cbSelectFreqUnit.getSelectionModel().select(cb.getFreqUnit());
@@ -372,42 +419,54 @@
//鐐瑰嚮锛氶��鍑�
private void clickExit() {
- addSubscribe(Observable.just(true)
+ Disposable d = Observable.just(true)
.subscribeOn(Schedulers.newThread())
.observeOn(Schedulers.io())
.doOnNext(new Consumer<Object>() {
@Override
public void accept(Object o) throws Exception {
+ //1. 鍋滄鍚屾
if (isSyncing()) {
stopSync();//鍋滄鍚屾
}
}
})
- .doOnNext(new Consumer<Object>() {
+ .concatMap(new Function<Object, ObservableSource<Object>>() {
@Override
- public void accept(Object o) throws Exception {
-
- //妫�鏌ョ郴缁熸槸鍚︽敮鎸佹墭鐩�
- if (SystemTray.isSupported()) {
- //绯荤粺鎵樼洏
- SystemTray tray = SystemTray.getSystemTray();
- if (tray != null) {
- TrayIcon[] icons = tray.getTrayIcons();
- for (TrayIcon icon : icons) {
- if (icon == null) continue;
+ public ObservableSource<Object> apply(Object o) throws Exception {
+ //2. 绉婚櫎绯荤粺鎵樼洏
+ return Observable.create(new ObservableOnSubscribe<Object>() {
+ @Override
+ public void subscribe(ObservableEmitter<Object> emitter) throws Exception {
+ //妫�鏌ョ郴缁熸槸鍚︽敮鎸佹墭鐩�
+ if (SystemTray.isSupported()) {
//閫�鍑轰箣鍓嶅厛绉婚櫎绯荤粺鎵樼洏鍥炬爣
- if (APPID.equals(icon.getActionCommand())) {
- tray.remove(icon);
- }
+ final SystemTray tray = SystemTray.getSystemTray();//绯荤粺鎵樼洏
+ final TrayIcon icon = getTrayIcon(tray, APPID);
+ Platform.runLater(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ //绉婚櫎绯荤粺鎵樼洏
+ tray.remove(icon);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if (emitter != null) {
+ emitter.onNext(o);
+ emitter.onComplete();
+ }
+ }
+ });
}
}
- }
+ });
}
})
- .subscribe(new Consumer<Boolean>() {
+ .subscribe(new Consumer<Object>() {
@Override
- public void accept(Boolean aBoolean) throws Exception {
-
+ public void accept(Object o) throws Exception {
+ //3. 鍋滄鍚屾鍜岀Щ闄ょ郴缁熸墭鐩樺悗锛岄��鍑虹▼搴�
TrayUtil.getInstance().exitApp();//閫�鍑�
}
}, new Consumer<Throwable>() {
@@ -417,7 +476,7 @@
TrayUtil.getInstance().exitApp();//閫�鍑�
}
- }));
+ });
}
@@ -495,11 +554,21 @@
//鐐瑰嚮锛氬仠姝㈠悓姝�
private void clickStopSync() {
- if (isSyncing()) {
- stopSync();//鍋滄鍚屾
- } else {
- updateResult("鏈惎鍔ㄥ悓姝ュ姛鑳斤紒");
+ stopSync();//鍋滄鍚屾
+ }
+
+ public TrayIcon getTrayIcon(SystemTray tray, String key) {
+ if (tray != null && key != null) {
+ TrayIcon[] icons = tray.getTrayIcons();
+ for (TrayIcon icon : icons) {
+ if (icon == null) continue;
+ //鎵惧埌鎸囧畾鐨勬墭鐩樺浘鏍�
+ if (key.equals(icon.getActionCommand())) {
+ return icon;
+ }
+ }
}
+ return null;
}
//瑙ｅ瘑
@@ -745,7 +814,10 @@
//鍚姩鍚屾鍔熻兘
private void startSync() {
mSyncCount = 0;
+ setInputText(txSyncStatus, "鍚姩涓�");
setInputText(txSyncCount, String.valueOf(mSyncCount));
+ setInputText(txStartSyncTime, "-");
+ setInputText(txLastSyncTime, "-");
final String srcHost = getInputText(tvInputSrcHost);
final String srcName = getInputText(tvInputSrcName);
@@ -800,14 +872,18 @@
.doOnNext(new Consumer<Object>() {
@Override
public void accept(Object o) throws Exception {
- //UI绾跨▼
+ setInputText(txStartSyncTime, DateUtils.formatDate(new Date()));
updateResult("杩炴帴涓�...");
+ btnStartSync.setDisable(true);
+ btnStopSync.setDisable(false);
}
})
.observeOn(Schedulers.newThread())
.concatMap(new Function<String, ObservableSource<String>>() {
@Override
public ObservableSource<String> apply(String targetFreq) throws Exception {
+ mSyncCount = 0;
+ setSyncing(true);
return getStartSyncObservable(srcHost, srcName, srcPwd, srcDbName, targetHost, targetName, targetPwd, targetDbName)
.map(new Function<String, String>() {
@Override
@@ -821,20 +897,18 @@
@Override
public void accept(Object o) throws Exception {
//鍚姩鎴愬姛
- setSyncing(true);
- mSyncCount++;
- if (mSyncCount >= Integer.MAX_VALUE) {
- mSyncCount = 0;
+ if (isSyncing()) {
+ mSyncCount++;
+ if (mSyncCount >= Integer.MAX_VALUE) {
+ mSyncCount = 0;
+ }
+ setInputText(txLastSyncTime, DateUtils.formatDate(new Date()));
+ setInputText(txSyncCount, String.valueOf(mSyncCount));
+ setInputText(txSyncStatus, "鍚屾涓�");
+ updateResult("鍚姩鎴愬姛锛�");
+ btnStartSync.setDisable(true);
+ btnStopSync.setDisable(false);
}
- setInputText(txLastSyncTime, DateUtils.formatDate(new Date()));
- setInputText(txSyncCount, String.valueOf(mSyncCount));
-
- btnStartSync.setDisable(true);
- btnStopSync.setDisable(false);
-
- setInputText(txSyncStatus, "鍚屾涓�");
- setInputText(txStartSyncTime, DateUtils.formatDate(new Date()));
- updateResult("鍚姩鎴愬姛锛�");
}
})
.map(new Function<String, Integer>() {
@@ -866,14 +940,17 @@
@Override
public void accept(Object o) throws Exception {
//鍚屾鎴愬姛锛�
- setSyncing(true);
- mSyncCount++;
- if (mSyncCount >= Integer.MAX_VALUE) {
- mSyncCount = 0;
+ if (isSyncing()) {
+ mSyncCount++;
+ if (mSyncCount >= Integer.MAX_VALUE) {
+ mSyncCount = 0;
+ }
+ setInputText(txLastSyncTime, DateUtils.formatDate(new Date()));
+ setInputText(txSyncCount, String.valueOf(mSyncCount));
+ updateResult("鍚屾鎴愬姛锛�");
+ btnStartSync.setDisable(true);
+ btnStopSync.setDisable(false);
}
- setInputText(txLastSyncTime, DateUtils.formatDate(new Date()));
- setInputText(txSyncCount, String.valueOf(mSyncCount));
- updateResult("鍚屾鎴愬姛锛�");
}
}, new Consumer<Throwable>() {
@Override
@@ -910,16 +987,16 @@
//鍋滄鍚屾
private void stopSync() {
+ setSyncing(false);
+ mSyncCount = 0;
if (mCompositeDisposable != null) {
- mCompositeDisposable.clear();
+ mCompositeDisposable.clear();//娉ㄦ剰锛氫細鎶婃墍鏈夋搷浣滈兘鍙栨秷
}
+ setInputText(txSyncStatus, "宸插仠姝�");
+ updateResult("鍚屾鍋滄锛�");
btnStartSync.setDisable(false);
btnStopSync.setDisable(true);
-
- setSyncing(false);
- setInputText(txSyncStatus, "宸插仠姝�");
- updateResult("鍋滄鎴愬姛锛�");
}
//淇濆瓨 鍦ㄥ惎鍔ㄦ椂鈥濆惎鍔ㄢ�滃悓姝ュ姛鑳�
@@ -975,7 +1052,8 @@
.doOnNext(new Consumer<Object>() {
@Override
public void accept(Object o) throws Exception {
- String targetUrl = "jdbc:sqlserver://" + targetHost + ";databaseName=" + targetDbName + ";integratedSecurity=false;";
+ String urlString = "jdbc:sqlserver://%s;databaseName=%s;integratedSecurity=false;";
+ String targetUrl = String.format(urlString, targetHost, targetDbName);
List<String> keyList = new ArrayList<>();
//1.浠庣洰鏍囧簱鏌ュ嚭鏉ユ湁澶氬皯浼犳劅鍣ㄩ渶瑕佹煡鎵�
@@ -983,7 +1061,7 @@
Statement stmt = con.createStatement()
) {
- ResultSet rs = stmt.executeQuery(SQL1_QUERY);
+ ResultSet rs = stmt.executeQuery(SQL_QUERY_TARGET);
while (rs.next()) {
keyList.add(rs.getString("IE_Param"));
}
@@ -1000,9 +1078,9 @@
for (String key : keyList) {
StringUtil.append(sb, key, "','");
}
- String sql = String.format(SQL2_QUERY, sb);
+ String sql = String.format(SQL_QUERY_SRC, sb);
- String srcUrl = "jdbc:sqlserver://" + srcHost + ";databaseName=" + srcDbName + ";integratedSecurity=false;";
+ String srcUrl = String.format(urlString, srcHost, srcDbName);
//System.out.println("sql2:" + sql);
Map<String, List<TargetBean>> map = new HashMap<>();
@@ -1052,7 +1130,7 @@
for (TargetBean tb : list) {
if (tb == null) continue;
- PreparedStatement ps = con3.prepareStatement(SQL3_UPDATE);
+ PreparedStatement ps = con3.prepareStatement(SQL_UPDATE_TARGET);
ps.setString(1, tb.getData());
ps.setTimestamp(2, tb.getTime());
ps.setString(3, version);
--
Gitblit v1.9.1