From 978500ef65c4ebd082eeb1af4a57d35a0682e554 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期一, 08 四月 2024 14:11:46 +0800
Subject: [PATCH] V2.103 edit by lijun @ 2024-04-08 1.修复前一版本核容参数中的组端下限和核容时长读取的点位为第一组的参数bug
---
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java | 2 +-
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt | 4 ++++
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 21 ++++++++++-----------
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt | 4 ++++
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class | 0
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class | 0
7 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
index 2586d16..dedb9dc 100644
--- a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
+++ b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
Binary files differ
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 7076df5..cb41896 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/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
index 62544c4..e4ae76d 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
index c01a0c8..b6e254a 100644
--- a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -5,6 +5,9 @@
娉ㄦ剰褰撳墠鐗堟湰鍦ㄨ缃崡鐟炵殑61850鍗忚浆绛惧悕鏃剁敤鐨� BTSE2/
+V2.103 edit by lijun @ 2024-04-08
+ 1.淇鍓嶄竴鐗堟湰鏍稿鍙傛暟涓殑缁勭涓嬮檺鍜屾牳瀹规椂闀胯鍙栫殑鐐逛綅涓虹涓�缁勭殑鍙傛暟bug
+
V2.102 edit by lijun @ 2023-08-16
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
@@ -12,6 +15,7 @@
4.鍏煎閫氳繃鍗楃憺鍗忚浆璇诲彇鐨勬牳瀹规椂闀垮拰缁勭涓嬮檺寮傚父bug
+
V6.102 edit by lijun @ 2023-08-16
1.淇宸ュ巶鍐呴儴缁�2璇诲彇鍙傛暟"鏍稿鏃堕暱"鍜�"缁勭涓嬮檺"鐐逛綅鐩墠浠嶇劧璇诲彇鐨勭粍1涓婄殑鍙傛暟鍒囪
2.鏂板杩滅▼鍚屾鏃堕棿鍔熻兘
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 466036a..bec0cd5 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
@@ -1003,7 +1003,7 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsBtseYx)", FBSDeviceName);
//-------------------------------------------------------------------------------------//
String c[] = null;
- DataSet ds_stat = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYx");
+ DataSet ds_stat = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYx").copy();
int size_cnt_stat = ds_stat.getMembers().size();
boolean[] alm = new boolean[] {false,false,false,false,false};
int size_cnt = ds_stat.getMembers().size();
@@ -1069,7 +1069,7 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsDevState )", FBSDeviceName);
//-------------------------------------------------------------------------------------//
comm_res = true;
- DataSet ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsDevState");
+ DataSet ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsDevState").copy();
if(null == ds) {
//鍏煎鑰佺増鏈崗杞暟鎹�
ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc");
@@ -1211,7 +1211,7 @@
//-------------------------------------------------------------------------------------//
comm_res = true;
} else if (FBS9100_ComBase.CMD_GetDischargeParm == cmd) {
- DataSet ds_pm = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc");
+ DataSet ds_pm = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc").copy();
if(null != ds_pm && null != ds_pm.getMembers()) {
int size_cnt = ds_pm.getMembers().size();
m_Association.getDataSetValues(ds_pm);
@@ -1266,17 +1266,16 @@
//System.out.println(fc_model_str);
}
}
- if(0 == m_FBS_DiscParamFromDev.GroupVol_LOW) {
- //娴嬭瘯鏃堕暱
- m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
- //缁勭涓嬮檺
- m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
- }
- if(0 == m_FBS_DiscParamFromDev.GroupVol_LOW) {
- //娴嬭瘯鏃堕暱
+ if(FBSDeviceName.contains("BTSE2")) {
+ //娴嬭瘯鏃堕暱[绗簩濂梋
m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO2.HiTestTmhour.mag.f", Fc.MX)*60);
//缁勭涓嬮檺
m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO2.LoBatVal.mag.f", Fc.MX);
+ }else{
+ //娴嬭瘯鏃堕暱[绗竴濂梋
+ m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
+ //缁勭涓嬮檺
+ m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
}
ds_pm = null;
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
index b416b54..62d10a6 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
@@ -30,7 +30,7 @@
/**************************************************************************/
/**************************************************************************/
public final static boolean app_debug = false;
- public final static double m_VersionNum = 2.102;
+ public final static double m_VersionNum = 2.103;
public final static String m_Version = "Welcome To Use BattMonitor_BTS_IEC61850 V"
+ m_VersionNum + " RC_20201003";
/**************************************************************************/
diff --git a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
index c01a0c8..b6e254a 100644
--- a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -5,6 +5,9 @@
娉ㄦ剰褰撳墠鐗堟湰鍦ㄨ缃崡鐟炵殑61850鍗忚浆绛惧悕鏃剁敤鐨� BTSE2/
+V2.103 edit by lijun @ 2024-04-08
+ 1.淇鍓嶄竴鐗堟湰鏍稿鍙傛暟涓殑缁勭涓嬮檺鍜屾牳瀹规椂闀胯鍙栫殑鐐逛綅涓虹涓�缁勭殑鍙傛暟bug
+
V2.102 edit by lijun @ 2023-08-16
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
@@ -12,6 +15,7 @@
4.鍏煎閫氳繃鍗楃憺鍗忚浆璇诲彇鐨勬牳瀹规椂闀垮拰缁勭涓嬮檺寮傚父bug
+
V6.102 edit by lijun @ 2023-08-16
1.淇宸ュ巶鍐呴儴缁�2璇诲彇鍙傛暟"鏍稿鏃堕暱"鍜�"缁勭涓嬮檺"鐐逛綅鐩墠浠嶇劧璇诲彇鐨勭粍1涓婄殑鍙傛暟鍒囪
2.鏂板杩滅▼鍚屾鏃堕棿鍔熻兘
--
Gitblit v1.9.1