From ea689ef369a3ac975b99eddc433029c19e981dd4 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期三, 21 二月 2024 17:00:49 +0800
Subject: [PATCH] V6.105 edit by lijun @ 2024-02-21 1.新增sign_type 标识当前设备是标准1托1还是标准1托2设备 [注意:在连接的设备是标准1托2时,电池信息配置中请选择标准1托2]
---
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 70e249d..1f0ae87 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,"
+ + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,sign_type,"
+ " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd"
+ " FROM " + Sql_Mysql.BattInf_Table
+ " WHERE FLOOR(FBSDeviceId/10000)=61850"
@@ -105,6 +105,9 @@
float float_vol_lev = res.getFloat("FloatVolLevel");
float float_curr_lev = res.getFloat("BattFloatCurrent");
int GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
+
+ int sign_type = res.getInt("sign_type"); //璁＄畻楠岀鐨勬柟寮�
+
if(GroupIndexInFBSDevice > 3) {
GroupIndexInFBSDevice = 3;
}
@@ -131,6 +134,12 @@
brt.GroupIndexInFBSDevice = GroupIndexInFBSDevice;
param_changed = true;
}
+ if(sign_type != brt.sign_type) {
+ brt.sign_type = sign_type;
+ param_changed = true;
+ }
+
+
if(true == param_changed) {
FBS9100_Task_Thread_SQL.update_BTS_BattGroupState_Table(m_Conn_Pool, brt.FBSDeviceId, brt.BattGroupId,
@@ -154,6 +163,9 @@
rtdata.FBSDeviceName = res.getString("FBSDeviceName").trim();
//rtdata.setDevRegCode(res.getString("BattGroupName6").trim());
rtdata.GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
+ rtdata.sign_type = res.getInt("sign_type");
+
+
if(rtdata.GroupIndexInFBSDevice > 3) {
rtdata.GroupIndexInFBSDevice = 3;
}
--
Gitblit v1.9.1