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/battdata_rt/BattData_RT_Array.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

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;

--
Gitblit v1.9.1