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/bin/com/battdata_rt/BattData_RT.class | 0
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java | 8 +++
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml | 12 +++++
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt | 1
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml | 12 +++++
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java | 2 +
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT$InsertDataToMysql_Task.class | 0
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 27 +++++++++++--
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt | 1
11 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT$InsertDataToMysql_Task.class b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT$InsertDataToMysql_Task.class
index 89466e7..98e8628 100644
--- a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT$InsertDataToMysql_Task.class
+++ b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT$InsertDataToMysql_Task.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class
index b3eaa3b..69be403 100644
--- a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class
+++ b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class
index e66189a..7b9f344 100644
--- a/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class
+++ b/iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.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 16f63c0..5bbc777 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/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
index 1faa8be..a123d45 100644
--- a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -7,6 +7,7 @@
V2.102 edit by lijun @ 2023-08-16
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
+ 2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
V6.102 edit by lijun @ 2023-08-16
diff --git a/iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml b/iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
index cc52e81..8aabf0e 100644
--- a/iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
+++ b/iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
@@ -24,7 +24,17 @@
<SizeBasedTriggeringPolicy size="20MB"/>
</Policies>
<!--淇濆瓨鏃ュ織鏂囦欢涓暟-->
- <DefaultRolloverStrategy max="9"/>
+ <DefaultRolloverStrategy max="15">
+ <Delete basePath="${LOG_HOME}/" maxDepth="2">
+ <IfFileName glob="*.log.gz" >
+ <IfAny>
+ <IfAccumulatedFileCount exceeds="14" />
+ </IfAny>
+ </IfFileName>
+ <!--!Note: 杩欓噷鐨刟ge蹇呴』鍜宖ilePattern鍗忚皟, 鍚庤�呮槸绮剧‘鍒癲d, 杩欓噷灏辫鍐欐垚xd, xD灏变笉璧蜂綔鐢�,鍙﹀, 鏁板瓧鏈�濂�>2, 鍚﹀垯鍙兘閫犳垚鍒犻櫎鐨勬椂鍊�, 鏈�杩戠殑鏂囦欢杩樺浜庤鍗犵敤鐘舵��,瀵艰嚧鍒犻櫎涓嶆垚鍔�!-->
+ <!--30澶�-->
+ </Delete>
+ </DefaultRolloverStrategy>
</RollingFile>
<!--error绾у埆鏃ュ織杈撳嚭-->
diff --git a/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml b/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
index cc52e81..8aabf0e 100644
--- a/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
+++ b/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
@@ -24,7 +24,17 @@
<SizeBasedTriggeringPolicy size="20MB"/>
</Policies>
<!--淇濆瓨鏃ュ織鏂囦欢涓暟-->
- <DefaultRolloverStrategy max="9"/>
+ <DefaultRolloverStrategy max="15">
+ <Delete basePath="${LOG_HOME}/" maxDepth="2">
+ <IfFileName glob="*.log.gz" >
+ <IfAny>
+ <IfAccumulatedFileCount exceeds="14" />
+ </IfAny>
+ </IfFileName>
+ <!--!Note: 杩欓噷鐨刟ge蹇呴』鍜宖ilePattern鍗忚皟, 鍚庤�呮槸绮剧‘鍒癲d, 杩欓噷灏辫鍐欐垚xd, xD灏变笉璧蜂綔鐢�,鍙﹀, 鏁板瓧鏈�濂�>2, 鍚﹀垯鍙兘閫犳垚鍒犻櫎鐨勬椂鍊�, 鏈�杩戠殑鏂囦欢杩樺浜庤鍗犵敤鐘舵��,瀵艰嚧鍒犻櫎涓嶆垚鍔�!-->
+ <!--30澶�-->
+ </Delete>
+ </DefaultRolloverStrategy>
</RollingFile>
<!--error绾у埆鏃ュ織杈撳嚭-->
diff --git a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java
index 01683da..6503325 100644
--- a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java
+++ b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java
@@ -75,6 +75,8 @@
public int mSaveDataTimeInterval = 10;
private float mDataHistoryNewLevel = (float) 0.01;
private int mTestDataRecordCountMax = 10000;
+
+ public int sign_type;
Logger logger = null;
/*********************************************************************************/
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;
}
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 92a6fa2..3e42208 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
@@ -32,6 +32,7 @@
import org.openmuc.openiec61850.clientgui.databind.Int64DataBind;
import org.openmuc.openiec61850.clientgui.databind.VisibleStringDataBind;
+import com.base.AppConfig;
import com.base.Com;
import com.battdata_rt.BattData_RT;
import com.battdata_rt.BattData_RT_Array;
@@ -39,6 +40,9 @@
/****************************************************************************************************/
public class BTS_61850_SocketClient extends Thread {
+ public static final int Sign_Type_Default = 0;
+ public static final int Sign_Type_InTow = 1; //姝ｅ父1鎵�2
+
private boolean m_App_IsAlive = true;
private FBS9100_VCData m_FBS_VCData = null;
private FBS9100_ParamDischarge m_FBS_DiscParam = null;
@@ -2161,7 +2165,7 @@
* @param agree
* @return
*/
- public static String getUKEYRootDomStr(String agree) {
+ public String getUKEYRootDomStr(String agree) {
String str1=agree.substring(0, agree.indexOf("BTSE"));
/**
* @lijun 鍏煎浣涘北涓夋湡鐗堟湰锛岀鍚嶄腑鐨凚TSE璺緞涓�鎷栦竴鍜屼竴鎷栦簩鍧囦负BTSE
@@ -2169,15 +2173,30 @@
// if(str1.length() > 0) {
// return "BTSE";
// }
- return agree.substring(str1.length(), agree.length());
+
+ //鍏煎姝ｅ父1鎵�2
+ if((null != m_RTData[0]) && (m_RTData[0].sign_type == Sign_Type_InTow)) {
+ return agree.substring(str1.length(), agree.length());
+ }else {
+ return "BTSE";
+ }
+
}
public static void main(String[] args) {
- System.out.println(getUKEYRootDomStr("ZJDYBTSE2"));
+ //System.out.println(getUKEYRootDomStr("ZJDYBTSE2"));
String btsid = "1234567890BTSE/ncdGGIO1.SPCSO2";
String keyid = "37395256AD72043037395256AD720430";
-
System.out.println(createSignature(btsid, keyid));
+
+
+ MysqlConnPool pool = new MysqlConnPool("127.0.0.1", 3360, 10);
+ BTS_61850_SocketClient ce = new BTS_61850_SocketClient(pool, new FBS9100_StatAndParam("127.0.01", 618500001), new BattData_RT_Array(new AppConfig(), new AppParam(), pool) , null);
+ ce.m_RTData[0] = new BattData_RT(new AppConfig(), new AppParam(), pool);
+ ce.m_RTData[0].sign_type = 0;
+
+
+ System.out.println(ce.getUKEYRootDomStr("ZJDYBTSE2"));
}
/*********************************************************************************************/
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 1faa8be..a123d45 100644
--- a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -7,6 +7,7 @@
V2.102 edit by lijun @ 2023-08-16
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
+ 2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
V6.102 edit by lijun @ 2023-08-16
--
Gitblit v1.9.1