From 89194580fce783fbffe56eed60bb66ebccaa6988 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期二, 19 三月 2024 10:41:43 +0800
Subject: [PATCH] 南瑞南网通信程序修改

---
 IEC61850_ForPowerSupply_ForNW/config.xml                                     |    2 
 IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java |    5 ++
 IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java       |   48 ++++++++++++------------
 IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt            |   12 ++++++
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/IEC61850_ForPowerSupply_ForNW/config.xml b/IEC61850_ForPowerSupply_ForNW/config.xml
index 1e9b6a6..ea32b1b 100644
--- a/IEC61850_ForPowerSupply_ForNW/config.xml
+++ b/IEC61850_ForPowerSupply_ForNW/config.xml
@@ -2,7 +2,7 @@
 
 <root>
   <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
-  <mysql_server_ip>127.0.0.1</mysql_server_ip>
+  <mysql_server_ip>192.168.10.79</mysql_server_ip>
   <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
   <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
   <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java b/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java
index 5f51e73..ba7ffb0 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java
@@ -49,30 +49,30 @@
 				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_CPSS_CommErr_ID, (float)0, (float)0,0,1, 0,1,"通信电源通信故障",sql);
 				
 				//ACDC
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID, (float)264.0, (float)110.0,1,1, 1,0,"交流输入1停电",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_PowerDown_ID, (float)264.0, (float)110.0,1,1, 1,0,"交流输入2停电",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_ThunderErr_ID, (float)0, (float)0,0, 2, 1,0,"交流输入1防雷器故障",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_ThunderErr_ID, (float)0, (float)0,0, 2, 1,0,"交流输入2防雷器故障",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_Trip_ID, (float)0, (float)0,0,2, 1,0,"第1路交流空开跳闸",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_Trip_ID, (float)0, (float)0,0,2, 1,0,"第2路交流空开跳闸",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_OverV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流A相过压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_UnderV_ID, (float)264, (float)176,1,2,1,0,"第1路交流A相欠压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_OverV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流B相过压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流B相欠压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_OverV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流C相过压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流C相欠压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_OverV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流A相过压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_UnderV_ID, (float)264, (float)176,1,2,1,0, "第2路交流A相欠压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_OverV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流B相过压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流B相欠压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_OverV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流C相过压",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流C相欠压",sql);				
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_Less_ID, (float)264, (float)110,1,2, 1,0,"第1路交流A相缺相",sql);				
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_Less_ID, (float)264, (float)110,1,2, 1,0,"第1路交流B相缺相",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_Less_ID, (float)264, (float)110,1,2, 1,0,"第1路交流C相缺相",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_Less_ID, (float)264, (float)110,1,2, 1,0,"第2路交流A相缺相",sql);				
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_Less_ID, (float)264, (float)110,1,2, 1,0,"第2路交流B相缺相",sql);
-				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_Less_ID, (float)264, (float)110,1,2, 1,0,"第2路交流C相缺相",sql);
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID, (float)264.0, (float)110.0,1,1, 1,0,"交流输入1停电",sql);		//交流输入1停电
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_PowerDown_ID, (float)264.0, (float)110.0,1,1, 1,0,"交流输入2停电",sql);		//交流输入2停电
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_ThunderErr_ID, (float)0, (float)0,0, 2, 1,0,"交流输入1防雷器故障",sql);			//交流输入1防雷器故障
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_ThunderErr_ID, (float)0, (float)0,0, 2, 1,0,"交流输入2防雷器故障",sql);			//交流输入2防雷器故障
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_Trip_ID, (float)0, (float)0,0,2, 1,0,"第1路交流空开跳闸",sql);					//第1路交流空开跳闸
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_Trip_ID, (float)0, (float)0,0,2, 1,0,"第2路交流空开跳闸",sql);					//第2路交流空开跳闸
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_OverV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流A相过压",sql);			//第1路交流A相过压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_UnderV_ID, (float)264, (float)176,1,2,1,0,"第1路交流A相欠压",sql);			//第1路交流A相欠压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_OverV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流B相过压",sql);			//第1路交流B相过压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流B相欠压",sql);			//第1路交流B相欠压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_OverV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流C相过压",sql);			//第1路交流C相过压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第1路交流C相欠压",sql);			//第1路交流C相欠压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_OverV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流A相过压",sql);			//第2路交流A相过压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_UnderV_ID, (float)264, (float)176,1,2,1,0, "第2路交流A相欠压",sql);			//第2路交流A相欠压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_OverV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流B相过压",sql);			//第2路交流B相过压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流B相欠压",sql);			//第2路交流B相欠压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_OverV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流C相过压",sql);			//第2路交流C相过压
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_UnderV_ID, (float)264, (float)176,1,2, 1,0,"第2路交流C相欠压",sql);			//第2路交流C相欠压				
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_Less_ID, (float)264, (float)110,1,2, 1,0,"第1路交流A相缺相",sql);			//第1路交流A相缺相			
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_Less_ID, (float)264, (float)110,1,2, 1,0,"第1路交流B相缺相",sql);			//第1路交流B相缺相
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_Less_ID, (float)264, (float)110,1,2, 1,0,"第1路交流C相缺相",sql);			//第1路交流C相缺相
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_Less_ID, (float)264, (float)110,1,2, 1,0,"第2路交流A相缺相",sql);			//第2路交流A相缺相			
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_Less_ID, (float)264, (float)110,1,2, 1,0,"第2路交流B相缺相",sql);			//第2路交流B相缺相
+				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_Less_ID, (float)264, (float)110,1,2, 1,0,"第2路交流C相缺相",sql);			//第2路交流C相缺相
 				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_MonitorErr_ID, (float)0, (float)0,0,2, 1,0,"监控单元故障",sql);
 				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module1Err_ID, (float)0, (float)0,0,3, 1,0,"模块1故障",sql);
 				insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module2Err_ID, (float)0, (float)0,0,3, 1,0,"模块2故障",sql);
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java b/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java
index 075c19d..8fb87d6 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java
@@ -320,6 +320,11 @@
 			for(int n=0;n<m_AL_Data.getItemCount();n++) {
 				
 				PowerData_RT rtpd = m_AL_Data.getItem(n);
+				
+				if(115 != (rtpd.PowerDevDeviceId/1000000)) {
+					//System.out.println(m_AL_Data.getItem(n).PowerDevDeviceId);
+					continue;
+				}
 								
 				Alarm_Param_SQL.init_alarm_param_sql(rtpd.PowerDevDeviceId, m_Conn_Pool);
 				
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt b/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
index b28d354..21f13dc 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
@@ -1,5 +1,17 @@
 	南瑞版本电源通信程序
 
+	南网电源告警逻辑
+		所有告警根据点位触发的告警-无告警参数,暂时不可关闭监测
+		交流配电柜
+				
+						
+		直流配电柜
+		
+		
+		高频开关柜
+
+
+
 
 V1.103  2024-03-07 lijun
 	1.新增历史告警分表,以及根据历史告警 记录最久保留3年的 电源历史告警记录

--
Gitblit v1.9.1