From c748a86a369741c192c0a95f4e443187d85ab32f Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期四, 11 一月 2024 17:09:44 +0800
Subject: [PATCH] 南瑞61850通信程序修改
---
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java | 3 ++-
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt | 2 +-
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.java | 2 +-
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 8 ++++++--
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt | 2 +-
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
8 files changed, 11 insertions(+), 6 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 a989719..2586d16 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 505b04d..16f63c0 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 bb745ef..fe8b206 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 1f9321a..1faa8be 100644
--- a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -1,5 +1,5 @@
鍗楃憺鐗堟湰鍗忚浆閫氫俊绋嬪簭
- 娉ㄦ剰鍗忚鍚嶇О鏄� TEMPLATE
+ 娉ㄦ剰鍗忚鍚嶇О鏄� TEMPLATEBTSE
璁惧ID 618500001
diff --git a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.java b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.java
index 8919c22..6da6c4c 100644
--- a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.java
+++ b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.java
@@ -422,7 +422,7 @@
if(true == sql.sqlMysqlCheckIfTableExist("tb_process_survey")) {
String sql_str_1 = "UPDATE " + "tb_process_survey" + " SET "
+ " Process_starttime='" + Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms) + "', "
- + " ProcessVersion='" + String.format("V%1.3f", ver) + "' "
+ + " ProcessVersion='NARI_" + String.format("V%1.3f", ver) + "' "
+ " WHERE ProcessId=11009";
sql.sqlMysqlExecute(sql_str_1);
res = true;
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 805dcf4..92a6fa2 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
@@ -945,7 +945,11 @@
fbs9100_jhpowerState.setDev_temp(((BdaFloat32) fc_mode).getFloat() - 10);
//fbs9100_jhpowerState.setDev_temp(readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn27.mag.f", Fc.MX)); //鍧囪 妯″潡娓╁害
}
-
+ if (fc_model_str.contains(FBSDeviceName + "/btgGGIO1.AnIn28.mag.f")) {
+ //鍗楃憺褰撳墠鐐逛綅鍊间负float鏍煎紡
+ m_FBS_VCData.m_SysState.AlarmState = Math.round(((BdaFloat32)fc_mode).getFloat());
+ //m_FBS_VCData.m_SysState.AlarmState = (int)readInt64NodeData(FBSDeviceName + "/btgGGIO1.AnIn28.mag.i",Fc.MX);
+ }
else if(fc_model_str.contains(FBSDeviceName + "/celGGIO1.AnIn")) {
if(isStartReadMonData) {
m = n;
@@ -1839,7 +1843,7 @@
logger.info("鍐欏叆绛惧悕:"+signature);
writeNodeDataString(FBSDeviceName+"/btgGGIO1.sign.setVal", "SP",signature);
//writeNodeDataString(FBSDeviceName+"/ncdGGIO1.sign.setVal", "SP",signature);
- Thread.sleep(900);
+ Thread.sleep(1500);
return true;
}
//writeNodeDataString(FBSDeviceName+"/ncdGGIO1.sign.setVal", "SP",m_StatAndParam.publicKeyY);
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 ab54c58..c8181d3 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
@@ -23,7 +23,8 @@
public final static boolean is_app_for_fbs_free_only = false;
public final static boolean is_app_for_bpm7100_only = false;
public final static boolean is_app_for_FBS9100S_only = true;
- /**************************************************************************/
+ /**************************************************0.
+ * ************************/
/**************************************************************************/
/**************************************************************************/
/**************************************************************************/
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 1f9321a..1faa8be 100644
--- a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -1,5 +1,5 @@
鍗楃憺鐗堟湰鍗忚浆閫氫俊绋嬪簭
- 娉ㄦ剰鍗忚鍚嶇О鏄� TEMPLATE
+ 娉ㄦ剰鍗忚鍚嶇О鏄� TEMPLATEBTSE
璁惧ID 618500001
--
Gitblit v1.9.1