From 31cd9f06569d931e7ffd0f2d2900c075da0068e3 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期二, 19 三月 2024 14:14:51 +0800
Subject: [PATCH] 修改告警解析
---
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 31 +++++++++++++++++++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
index c41e82b..7076df5 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
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 443d35b..466036a 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
@@ -171,7 +171,10 @@
logger.debug("BTS_IEC61850_Client Unable to connect to device IP:" + FBSDeviceIp);
continue;
}
- if(this.FBSDeviceName.indexOf("BTSE")>0) {
+ if(this.FBSDeviceName.indexOf("BTSE2")>0) {
+ //閫傞厤鍚勪釜涓嶅悓鍗忚鍚嶇О鐨�61850璁惧閫氫俊[璇诲彇鏀剧數鍙傛暟鏃剁敤鍒癩
+ ZJDYCPSS = this.FBSDeviceName.replace("BTSE2", "CPSS");
+ }else if(this.FBSDeviceName.indexOf("BTSE")>0) {
//閫傞厤鍚勪釜涓嶅悓鍗忚鍚嶇О鐨�61850璁惧閫氫俊[璇诲彇鏀剧數鍙傛暟鏃剁敤鍒癩
ZJDYCPSS = this.FBSDeviceName.replace("BTSE", "CPSS");
}
@@ -1232,6 +1235,11 @@
dis_hour_t = dis_hour_t * 60;
m_FBS_DiscParamFromDev.DisTime = (int) dis_hour_t;
//m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
+ }else if (fc_model_str.contains("/cheGGIO2.HiTestTmhour.mag.f")) {
+ float dis_hour_t = Float.parseFloat(tf_t.getText());
+ dis_hour_t = dis_hour_t * 60;
+ m_FBS_DiscParamFromDev.DisTime = (int) dis_hour_t;
+ //m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
}else if (fc_model_str.contains(FBSDeviceName + "/ncdGGIO1.HiTestBatAh.mag.f")) {
m_FBS_DiscParamFromDev.DisCap = Float.parseFloat(tf_t.getText());
//m_FBS_DiscParamFromDev.DisCap = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.HiTestBatAh.mag.f", Fc.MX);
@@ -1240,6 +1248,9 @@
//m_FBS_DiscParamFromDev.MonomerTmp_High = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.HiCelTemp.mag.f", Fc.MX);
// /*鍏煎鐐归泦涓殑缁�2鍙傛暟涓虹粍1*/ }else if (fc_model_str.contains(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f")) {
}else if (fc_model_str.contains("/cheGGIO1.LoBatVal.mag.f")) {
+ m_FBS_DiscParamFromDev.GroupVol_LOW = Float.parseFloat(tf_t.getText());
+ //m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
+ }else if (fc_model_str.contains("/cheGGIO2.LoBatVal.mag.f")) {
m_FBS_DiscParamFromDev.GroupVol_LOW = Float.parseFloat(tf_t.getText());
//m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
}else if (fc_model_str.contains(FBSDeviceName + "/ncdGGIO1.LoCelVol.mag.f")) {
@@ -1263,10 +1274,11 @@
}
if(0 == m_FBS_DiscParamFromDev.GroupVol_LOW) {
//娴嬭瘯鏃堕暱
- m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(FBSDeviceName + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
+ m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO2.HiTestTmhour.mag.f", Fc.MX)*60);
//缁勭涓嬮檺
- m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(FBSDeviceName + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
- }
+ m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO2.LoBatVal.mag.f", Fc.MX);
+ }
+
ds_pm = null;
}else {
@@ -2243,6 +2255,17 @@
boolean[] a = new boolean[] {false,true,false};
String format1 = String.format("%b,%b,%b",a[0],a[1],a[2] );
System.out.println(format1);
+
+ String ZJDYCPSS = "";
+ String FBSDeviceName = "ZJDYBTSE2";
+ if(FBSDeviceName.indexOf("BTSE2")>0) {
+ //閫傞厤鍚勪釜涓嶅悓鍗忚鍚嶇О鐨�61850璁惧閫氫俊[璇诲彇鏀剧數鍙傛暟鏃剁敤鍒癩
+ ZJDYCPSS = FBSDeviceName.replace("BTSE2", "CPSS");
+ }else if(FBSDeviceName.indexOf("BTSE")>0) {
+ //閫傞厤鍚勪釜涓嶅悓鍗忚鍚嶇О鐨�61850璁惧閫氫俊[璇诲彇鏀剧數鍙傛暟鏃剁敤鍒癩
+ ZJDYCPSS = FBSDeviceName.replace("BTSE", "CPSS");
+ }
+ System.out.println(ZJDYCPSS);
}
/*********************************************************************************************/
--
Gitblit v1.9.1