From 41cd05e6eb7a1bd8130bbd1b6c9540137b82f9d6 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期五, 19 一月 2024 01:18:24 +0800
Subject: [PATCH] V2.102 edit by lijun @ 2023-08-16 1.当前版本修改为南瑞协转的通信程序 2.兼容正常1托2和常规1托2
---
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java | 8 +++++++-
1 files changed, 7 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 f03d64d..0d316b9 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
@@ -84,7 +84,7 @@
String sql_str = "SELECT DISTINCT "
+ " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,"
- + " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd"
+ + " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd,sign_type"
+ " FROM " + Sql_Mysql.BattInf_Table
+ " WHERE FLOOR(FBSDeviceId/10000)=61850"
+ " ORDER BY BattGroupId ASC";
@@ -105,6 +105,7 @@
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 +132,10 @@
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 +159,7 @@
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