From f9b5693cf3aaae3087e0372827d85f3fe8208ee6 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期二, 13 五月 2025 10:37:04 +0800
Subject: [PATCH] 重庆定制需求

---
 iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java |    7 +++++--
 1 files changed, 5 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 156c54d..13f0174 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,KeyID,"
+							+ " StationId,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,7 +102,10 @@
 				}
 				boolean batt_group_exist = false;
 				//String reg_code = res.getString("BattGroupName6").trim();
+				
 				String ukeyID = res.getString("KeyID").trim();
+				String station_id = res.getString("StationId").trim();
+				
 				float float_vol_lev = res.getFloat("FloatVolLevel");
 				float float_curr_lev = res.getFloat("BattFloatCurrent");
 				int GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
@@ -177,7 +180,7 @@
 					if(rtdata.GroupIndexInFBSDevice < 0) {
 						rtdata.GroupIndexInFBSDevice = 0;
 					}
-					
+					rtdata.StationId = station_id;
 					rtdata.BattGroupId = res.getInt("BattGroupId");
 					rtdata.BattGroupNum = res.getInt("BattGroupNum");
 					

--
Gitblit v1.9.1