From 1078b4b30c51f103952b44279c9a97972beacca6 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期六, 12 十月 2024 08:46:07 +0800
Subject: [PATCH] 新增天一电厂数据库配置
---
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java | 2 +
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 93 +++++++++++++++++++++++++---------------------
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/MysqlConnPool.class | 0
4 files changed, 52 insertions(+), 43 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 8fc2bd9..e61ba37 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/MysqlConnPool.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/MysqlConnPool.class
index 4fdda6f..8f53757 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/MysqlConnPool.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/MysqlConnPool.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 b341419..f8b2658 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
@@ -187,51 +187,58 @@
}
}
- logger.debug("Successfully connected to ied server " + FBSDeviceIp + " " + FBSDeviceName + "\t CPSS:"+ZJDYCPSS);
- logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_Client retrieving model...");
- /*
+ /**
+ * 娣诲姞寮傚父鎹曡幏锛屾鐜囧紓甯告姤閿欑嚎绋嬩細寮傚父缁撴潫
+ */
try {
- m_ServerModel = m_Association.retrieveModel();
- } catch (ServiceError | IOException e) {
- logger.error(e.toString(), e);
- continue;
+ logger.debug("Successfully connected to ied server " + FBSDeviceIp + " " + FBSDeviceName + "\t CPSS:"+ZJDYCPSS);
+ logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_Client retrieving model...");
+ /*
+ try {
+ m_ServerModel = m_Association.retrieveModel();
+ } catch (ServiceError | IOException e) {
+ logger.error(e.toString(), e);
+ continue;
+ }
+ */
+ /*
+ System.out.println("reading model from file...");
+
+ try {
+ m_ServerModel = m_Association.getModelFromSclFile("zjdy_bts_1_2G.icd");
+ //serverModel = association.getModelFromSclFile(modelFileParam.getValue());
+ } catch (SclParseException e1) {
+ System.out.println("Error parsing SCL file: " + e1.getMessage());
+ return;
+ }
+
+ System.out.println("successfully read model");
+ */
+
+ /************************* read m_DevVersion first *************************/
+ m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC);
+ /***************************************************************************/
+ logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion);
+
+ m_FBS_VCData.m_SysState.resetErrCommCount();
+ FBS9100_Task_Thread_SQL.inseartOrUpdateFBS9100SFODParam(m_ConnPool, m_StatAndParam.clParam, m_StatAndParam);
+
+ FBS9100_Task_Thread_SQL.queryBTS61850OffLineyhPlanOnRam(m_ConnPool, m_StatAndParam);
+
+ FBS9100_Task_Thread_SQL.inseartDev_6185_AlmParam(m_ConnPool, m_StatAndParam.dev_id);
+
+ m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
+ m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC); //鍞竴搴忓垪鍙�
+ BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam); //鏇存柊褰撳墠鍙傛暟
+
+
+ //璇诲彇涓讳粠鏈哄姛鑳戒娇鑳�
+ m_FBS_VCData.m_SysState.MasterSlave_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn29.mag.f",Fc.MX));
+ //璇诲彇骞叉帴鐐瑰姛鑳戒娇鑳�
+ m_FBS_VCData.m_SysState.DryContact_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn30.mag.f",Fc.MX));
+ } catch (Exception e) {
+ logger.error(e.toString(),e);
}
- */
- /*
- System.out.println("reading model from file...");
-
- try {
- m_ServerModel = m_Association.getModelFromSclFile("zjdy_bts_1_2G.icd");
- //serverModel = association.getModelFromSclFile(modelFileParam.getValue());
- } catch (SclParseException e1) {
- System.out.println("Error parsing SCL file: " + e1.getMessage());
- return;
- }
-
- System.out.println("successfully read model");
- */
-
- /************************* read m_DevVersion first *************************/
- m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC);
- /***************************************************************************/
- logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion);
-
- m_FBS_VCData.m_SysState.resetErrCommCount();
- FBS9100_Task_Thread_SQL.inseartOrUpdateFBS9100SFODParam(m_ConnPool, m_StatAndParam.clParam, m_StatAndParam);
-
- FBS9100_Task_Thread_SQL.queryBTS61850OffLineyhPlanOnRam(m_ConnPool, m_StatAndParam);
-
- FBS9100_Task_Thread_SQL.inseartDev_6185_AlmParam(m_ConnPool, m_StatAndParam.dev_id);
-
- m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
- m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC); //鍞竴搴忓垪鍙�
- BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam); //鏇存柊褰撳墠鍙傛暟
-
-
- //璇诲彇涓讳粠鏈哄姛鑳戒娇鑳�
- m_FBS_VCData.m_SysState.MasterSlave_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn29.mag.f",Fc.MX));
- //璇诲彇骞叉帴鐐瑰姛鑳戒娇鑳�
- m_FBS_VCData.m_SysState.DryContact_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn30.mag.f",Fc.MX));
while (true == Get_AppAliveState()) {
try {
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java
index 3a75212..b60a880 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java
@@ -35,6 +35,8 @@
mysql_ds.setJdbcUrl("jdbc:mysql://" + server_ip + ":" + mSqlPort + "/db_app_sys");
mysql_ds.setUser("root");
mysql_ds.setPassword("lmx8688139");
+ //mysql_ds.setUser("whyc"); //澶╀竴鐢靛巶璐﹀彿
+ //mysql_ds.setPassword("Fg001@hdw"); //澶╀竴鐢靛巶瀵嗙爜
mysql_ds.setMaxPoolSize(conncount_max);
mysql_ds.setMinPoolSize(2);
mysql_ds.setAcquireIncrement(4);
--
Gitblit v1.9.1