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/dec/fbs9100/BTS_61850_SocketClient.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
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"));
}
/*********************************************************************************************/
--
Gitblit v1.9.1