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/BTS_61850_SocketClient.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

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)) {

--
Gitblit v1.9.1