From 2c735cefd694ddbadfd7456f5ad27e0e242efb11 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期二, 14 一月 2025 10:32:54 +0800
Subject: [PATCH] V6.109 edit by lijun @ 2025-01-15 1.设备遥调遥控需要先绑定设备Ukey上的UkeyID[可通过网页工具，或者ukey调试工具读取]
---
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java | 2
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class | 0
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java | 10 ++++-
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 11 ++++-
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt | 3 +
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java | 9 +++-
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt | 3 +
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread_SQL.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java | 37 +++++++++++++++++-
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class | 0
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class | 0
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class | 0
13 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class
index a99ffc9..ec1406d 100644
--- a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class
+++ b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class
index 1c74f8f..63cb463 100644
--- a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class
+++ b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
index 0f14abe..73a2761 100644
--- a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
+++ b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread_SQL.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread_SQL.class
index 88f9578..692a6f8 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread_SQL.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread_SQL.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
index 5304c8a..f82b9ef 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
index 03e22a6..639a252 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
index afcc983..d27b7f8 100644
--- a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -16,6 +16,9 @@
鈶°��鑻ユ祴璇曡繃绋嬩腑璁惧宸ヤ綔鐘舵�佷负鍏呯數娴嬶紝璁板綍鍦ㄦ牳瀹瑰厖鐢甸噷闈€�傚惁鍒欎负鐩戞祴鍏呯數銆�
鈶€��鏁版嵁缁撴潫閫昏緫涓猴細褰撳墠鐢垫睜鐢垫祦<(娴厖鐢垫祦闃堝��+2)
+V6.109 edit by lijun @ 2025-01-15
+ 1.璁惧閬ヨ皟閬ユ帶闇�瑕佸厛缁戝畾璁惧Ukey涓婄殑UkeyID[鍙�氳繃缃戦〉宸ュ叿锛屾垨鑰卽key璋冭瘯宸ュ叿璇诲彇]
+
V6.108 edit by lijun @ 2024-09-06
1.淇閫氫俊绾跨▼锛孧SQL鎶涘嚭寮傚父瀵艰嚧绾跨▼寮傚父缁撴潫bug
diff --git a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java
index de8c3ce..b5a5140 100644
--- a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java
+++ b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java
@@ -80,7 +80,7 @@
private float mDataHistoryNewLevel = (float) 0.01;
private int mTestDataRecordCountMax = 10000;
-
+ public String ukeyID = ""; //缁戝畾UKEYID
public int sign_type = SIGN_TYPE_Default;
Logger logger = null;
@@ -957,7 +957,13 @@
}
- /**
+ public String getUkeyID() {
+ return ukeyID;
+ }
+ public void setUkeyID(String ukeyID) {
+ this.ukeyID = ukeyID;
+ }
+ /**
* 鍒犻櫎璁板綍
* @param pool
* @param battGroupId
diff --git a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java
index 1f0ae87..156c54d 100644
--- a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java
+++ b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java
@@ -83,7 +83,7 @@
sql.sqlMysqlUseDB(Sql_Mysql.DB_BATT_INF);
String sql_str = "SELECT DISTINCT "
- + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,sign_type,"
+ + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,sign_type,KeyID,"
+ " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd"
+ " FROM " + Sql_Mysql.BattInf_Table
+ " WHERE FLOOR(FBSDeviceId/10000)=61850"
@@ -102,6 +102,7 @@
}
boolean batt_group_exist = false;
//String reg_code = res.getString("BattGroupName6").trim();
+ String ukeyID = res.getString("KeyID").trim();
float float_vol_lev = res.getFloat("FloatVolLevel");
float float_curr_lev = res.getFloat("BattFloatCurrent");
int GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
@@ -138,6 +139,10 @@
brt.sign_type = sign_type;
param_changed = true;
}
+ if(ukeyID.equals(brt.getUkeyID())) {
+ brt.ukeyID = ukeyID;
+ param_changed = true;
+ }
@@ -164,7 +169,7 @@
//rtdata.setDevRegCode(res.getString("BattGroupName6").trim());
rtdata.GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
rtdata.sign_type = res.getInt("sign_type");
-
+ rtdata.ukeyID = res.getString("KeyID").trim();
if(rtdata.GroupIndexInFBSDevice > 3) {
rtdata.GroupIndexInFBSDevice = 3;
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java
index 7661773..4e069ee 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java
@@ -122,14 +122,14 @@
*/
public static void UpdateBattInfTable(MysqlConnPool m_ConnPool,FBS9100_StatAndParam param) {
String sql_str = " UPDATE " + Sql_Mysql.BattInf_Table + ""
- + " SET PublicKeyX = '"+ param.publicKeyX +"',KeyID = '" + param.keyID + "',SerialNumber = '"+param.serialNumber+"'"
+ + " SET PublicKeyX = '" + param.publicKeyX /* +"',KeyID = '" + param.keyID */ + "',SerialNumber = '"+param.serialNumber+"'"
+ " WHERE FBSDeviceId = " + param.dev_id;
Sql_Mysql sql = new Sql_Mysql(m_ConnPool);
try {
sql.sqlMysqlExecute(sql_str);
} catch (SQLException e) {
- e.printStackTrace();
+ sql.logger.error("BTS61850_Task_Thread_SQL.UpdateBattInfTable():" + e.toString(), e);
} finally {
sql.close_con();
}
@@ -151,11 +151,42 @@
try {
sql.sqlMysqlExecute(sql_str);
} catch (SQLException e) {
- sql.logger.error("BTS61850_Task_Thread_SQL.updateBattRtState_Table():" + e.toString(), e);
+ sql.logger.error("BTS61850_Task_Thread_SQL.updateBattRtState_Table():" + e.toString(), e);
} finally {
sql.close_con();
}
}
}
+
+ /**
+ * 鏌ヨ璁惧鐨剈KeyID
+ * @param m_ConnPool
+ * @param dev_id
+ * @return
+ */
+ public static String queryDeviceUkeyID(MysqlConnPool m_ConnPool, int dev_id) {
+ String ukeyID = "";
+ String sql_str = "SELECT KeyID FROM " + Sql_Mysql.BattInf_Table+ " WHERE FBSDeviceId = " + dev_id + " LIMIT 1";
+ Sql_Mysql sql = new Sql_Mysql(m_ConnPool);
+ ResultSet res = null;
+ try {
+ res = sql.sqlMysqlQuery(sql_str);
+ if(res.next()) {
+ ukeyID = res.getString("KeyID").trim();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally {
+ if(null != res) {
+ try {
+ res.close();
+ } catch (SQLException e) {
+ sql.logger.error("BTS61850_Task_Thread_SQL.queryDeviceUkeyID():" + e.toString(), e);
+ }
+ }
+ sql.close_con();
+ }
+ return ukeyID;
+ }
}
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
index 8465d8d..f3b8ab7 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -132,6 +132,9 @@
MonVolStd = AL_RTdata.getItem(n).MonStdVol;
FBSDeviceName = AL_RTdata.getItem(n).FBSDeviceName;
m_StatAndParam.BattGroupId = AL_RTdata.getItem(n).BattGroupId;
+
+ //
+ m_StatAndParam.keyID = AL_RTdata.getItem(n).ukeyID;
//FBSDeviceIp = AL_RTdata.getItem(n).FBSDeviceIp;
}
}
@@ -227,9 +230,9 @@
FBS9100_Task_Thread_SQL.inseartDev_6185_AlmParam(m_ConnPool, m_StatAndParam.dev_id);
- m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
+ //m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC); //鍞竴搴忓垪鍙�
- BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam); //鏇存柊褰撳墠鍙傛暟
+ //BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam); //鏇存柊褰撳墠鍙傛暟
//璇诲彇涓讳粠鏈哄姛鑳戒娇鑳�
@@ -298,8 +301,10 @@
//璇诲彇涓�娆key
- m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
+ //m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
+ m_StatAndParam.keyID = BTS61850_Task_Thread_SQL.queryDeviceUkeyID(m_ConnPool,m_StatAndParam.dev_id);
m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC); //鍞竴搴忓垪鍙�
+ BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam); //鏇存柊褰撳墠鍙傛暟
}
} else if (FBS9100_ComBase.CMD_SetIp == m_FBS_DiscParam.op_cmd) {
if (true == BTS_IEC61850_SocketComm(FBS9100_ComBase.CMD_SetIp)) {
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
index 6f2544d..6f1f998 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
@@ -29,7 +29,7 @@
/**************************************************************************/
/**************************************************************************/
public final static boolean app_debug = false;
- public final static double m_VersionNum = 6.108;
+ public final static double m_VersionNum = 6.109;
public final static String m_Version = "Welcome To Use BattMonitor_BTS_IEC61850 V"
+ m_VersionNum + " RC_20201003";
/**************************************************************************/
diff --git a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
index afcc983..d27b7f8 100644
--- a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -16,6 +16,9 @@
鈶°��鑻ユ祴璇曡繃绋嬩腑璁惧宸ヤ綔鐘舵�佷负鍏呯數娴嬶紝璁板綍鍦ㄦ牳瀹瑰厖鐢甸噷闈€�傚惁鍒欎负鐩戞祴鍏呯數銆�
鈶€��鏁版嵁缁撴潫閫昏緫涓猴細褰撳墠鐢垫睜鐢垫祦<(娴厖鐢垫祦闃堝��+2)
+V6.109 edit by lijun @ 2025-01-15
+ 1.璁惧閬ヨ皟閬ユ帶闇�瑕佸厛缁戝畾璁惧Ukey涓婄殑UkeyID[鍙�氳繃缃戦〉宸ュ叿锛屾垨鑰卽key璋冭瘯宸ュ叿璇诲彇]
+
V6.108 edit by lijun @ 2024-09-06
1.淇閫氫俊绾跨▼锛孧SQL鎶涘嚭寮傚父瀵艰嚧绾跨▼寮傚父缁撴潫bug
--
Gitblit v1.9.1