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/BTS61850_Task_Thread_SQL.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

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;
+	}
 }

--
Gitblit v1.9.1