From 027d4a8e00a9881884824be44d9aee0289b747d4 Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期二, 15 八月 2023 16:34:25 +0800
Subject: [PATCH] V1.85 edit at date 2023-08-15 	1.创建表'db_alarm.tb_alarm_manual_clear' 	2.创建表'web_site.tb_fbs9100_setparam_temp' 	3.创建表'db_param.tb_appalm_param',并录入所有[电源,电池,设备告警是否能自动消失配置]

---
 BattMonitor_DB_Builder/src/com/database_util/SqlsUtils.java |  214 ++++++++++++++++++++++++++--------------------------
 1 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/BattMonitor_DB_Builder/src/com/database_util/SqlsUtils.java b/BattMonitor_DB_Builder/src/com/database_util/SqlsUtils.java
index 6d1a914..fc01567 100644
--- a/BattMonitor_DB_Builder/src/com/database_util/SqlsUtils.java
+++ b/BattMonitor_DB_Builder/src/com/database_util/SqlsUtils.java
@@ -189,25 +189,25 @@
     /**
      *	 山西电源部分电源告警id
      */
-    public final static int ALM_TYPE_ACDC_AcIn1_A_OverV_ID 	 	= 110001;			//交流A相过压	
-    public final static int ALM_TYPE_ACDC_AcIn1_A_UnderV_ID  	= 110002;			//交流A相欠压
-    public final static int ALM_TYPE_ACDC_AcIn1_A_Less_ID 	 	= 110003;			//交流A相缺相
-    public final static int ALM_TYPE_ACDC_AcIn1_B_OverV_ID 	 	= 110004;			//交流B相过压
-    public final static int ALM_TYPE_ACDC_AcIn1_B_UnderV_ID  	= 110005;			//交流B相欠压
-    public final static int ALM_TYPE_ACDC_AcIn1_B_Less_ID 	 	= 110006;			//交流B相缺相
-    public final static int ALM_TYPE_ACDC_AcIn1_C_OverV_ID 	 	= 110007;			//交流C相过压
-    public final static int ALM_TYPE_ACDC_AcIn1_C_UnderV_ID  	= 110008;			//交流C相欠压
-    public final static int ALM_TYPE_ACDC_AcIn1_C_Less_ID 	 	= 110009;			//交流C相缺相
+    public final static int ALM_TYPE_ACDC_AcIn1_A_OverV_ID 	 	= 110001;			//1路交流A相过压告警	
+    public final static int ALM_TYPE_ACDC_AcIn1_A_UnderV_ID  	= 110002;			//1路交流A相欠压告警
+    public final static int ALM_TYPE_ACDC_AcIn1_A_Less_ID 	 	= 110003;			//1路交流A相缺相告警
+    public final static int ALM_TYPE_ACDC_AcIn1_B_OverV_ID 	 	= 110004;			//1路交流B相过压告警
+    public final static int ALM_TYPE_ACDC_AcIn1_B_UnderV_ID  	= 110005;			//1路交流B相欠压告警
+    public final static int ALM_TYPE_ACDC_AcIn1_B_Less_ID 	 	= 110006;			//1路交流B相缺相告警
+    public final static int ALM_TYPE_ACDC_AcIn1_C_OverV_ID 	 	= 110007;			//1路交流C相过压告警
+    public final static int ALM_TYPE_ACDC_AcIn1_C_UnderV_ID  	= 110008;			//1路交流C相欠压告警
+    public final static int ALM_TYPE_ACDC_AcIn1_C_Less_ID 	 	= 110009;			//1路交流C相缺相告警
     
-    public final static int ALM_TYPE_ACDC_AcIn1_PowerDown_ID 	= 110010;			//交流停电
+    public final static int ALM_TYPE_ACDC_AcIn1_PowerDown_ID 	= 110010;			//交流停电告警
     public final static int ALM_TYPE_ACDC_AcIn1_ThunderErr_ID 	= 110011;			//防雷器故障
 
-    public final static int ALM_TYPE_ACDC_DCout_OverV_ID 		= 110012;			//直流电压过高
-    public final static int ALM_TYPE_ACDC_DCout_UnderV_ID 		= 110013;			//直流电压过低
+    public final static int ALM_TYPE_ACDC_DCout_OverV_ID 		= 110012;			//直流电压过高告警
+    public final static int ALM_TYPE_ACDC_DCout_UnderV_ID 		= 110013;			//直流电压过低告警
 
-    public final static int ALM_TYPE_ACDC_LoaderFuse_ID 		= 110014;			//负载熔断
-    public final static int ALM_TYPE_ACDC_BattGrp1Fuse_ID 		= 110015;			//电池组1熔断
-    public final static int ALM_TYPE_ACDC_BattGrp2Fuse_ID 		= 110016;			//电池组2熔断
+    public final static int ALM_TYPE_ACDC_LoaderFuse_ID 		= 110014;			//负载熔断告警
+    public final static int ALM_TYPE_ACDC_BattGrp1Fuse_ID 		= 110015;			//电池组1熔断告警
+    public final static int ALM_TYPE_ACDC_BattGrp2Fuse_ID 		= 110016;			//电池组2熔断告警
 
     public final static int ALM_TYPE_ACDC_Module1Err_ID 		= 110017;			//整流器1总故障
     public final static int ALM_TYPE_ACDC_Module2Err_ID 		= 110018;			//整流器2总故障
@@ -229,104 +229,104 @@
     public final static int ALM_TYPE_ACDC_AcAlarm_ID 			= 110033;			//交流总故障
     public final static int ALM_TYPE_ACDC_DcAlarm_ID 			= 110034;			//直流总故障
     
-	public final static int ALM_TYPE_ACDC_Acb1_OverCurrA_ID 	= 110035;			//交流A相过流
-	public final static int ALM_TYPE_ACDC_Acb1_OverCurrB_ID 	= 110036;			//交流B相过流
-	public final static int ALM_TYPE_ACDC_Acb1_OverCurrC_ID 	= 110037;			//交流C相过流
+	public final static int ALM_TYPE_ACDC_Acb1_OverCurrA_ID 	= 110035;			//交流A相过流告警
+	public final static int ALM_TYPE_ACDC_Acb1_OverCurrB_ID 	= 110036;			//交流B相过流告警
+	public final static int ALM_TYPE_ACDC_Acb1_OverCurrC_ID 	= 110037;			//交流C相过流告警
 
-	public final static int ALM_TYPE_ACDC_MonitorErr_ID 		= 110038;			//监控器故障
-	public final static int ALM_TYPE_ACDC_DcOut_OverCurr_ID 	= 110039;			//直流过流
+	public final static int ALM_TYPE_ACDC_MonitorErr_ID 		= 110038;			//监控器故障告警
+	public final static int ALM_TYPE_ACDC_DcOut_OverCurr_ID 	= 110039;			//直流过流告警
 	public final static int ALM_TYPE_ACDC_TolalAlarm_ID 		= 110040;			//开关柜总报警
-	public final static int ALM_TYPE_ACDC_Batt1_VolLow_ID 		= 110041;			//电池组1电压低
-	public final static int ALM_TYPE_ACDC_Batt2_VolLow_ID 		= 110042;			//电池组2电压低
-	public final static int ALM_TYPE_ACDC_Batt1_Down_ID 		= 110043;			//电池组1下电
-	public final static int ALM_TYPE_ACDC_Batt2_Down_ID 		= 110044;			//电池组2下电
-	public final static int ALM_TYPE_ACDC_Batt1_OverChgCurr_ID 	= 110045;			//电池组1充电过流
-	public final static int ALM_TYPE_ACDC_Batt2_OverChgCurr_ID 	= 110046;			//电池组2充电过流
+	public final static int ALM_TYPE_ACDC_Batt1_VolLow_ID 		= 110041;			//电池组1电压低告警
+	public final static int ALM_TYPE_ACDC_Batt2_VolLow_ID 		= 110042;			//电池组2电压低告警
+	public final static int ALM_TYPE_ACDC_Batt1_Down_ID 		= 110043;			//电池组1下电告警
+	public final static int ALM_TYPE_ACDC_Batt2_Down_ID 		= 110044;			//电池组2下电告警
+	public final static int ALM_TYPE_ACDC_Batt1_OverChgCurr_ID 	= 110045;			//电池组1充电过流告警
+	public final static int ALM_TYPE_ACDC_Batt2_OverChgCurr_ID 	= 110046;			//电池组2充电过流告警
 	
-    public final static int ALM_TYPE_ACDC_Mod1_OverVol_ID 		= 110047;			//整流器1过压
-    public final static int ALM_TYPE_ACDC_Mod2_OverVol_ID 		= 110048;			//整流器2过压
-    public final static int ALM_TYPE_ACDC_Mod3_OverVol_ID 		= 110049;			//整流器3过压
-    public final static int ALM_TYPE_ACDC_Mod4_OverVol_ID 		= 110050;			//整流器4过压
-    public final static int ALM_TYPE_ACDC_Mod5_OverVol_ID 		= 110051;			//整流器5过压
-    public final static int ALM_TYPE_ACDC_Mod6_OverVol_ID 		= 110052;			//整流器6过压
-    public final static int ALM_TYPE_ACDC_Mod7_OverVol_ID 		= 110053;			//整流器7过压
-    public final static int ALM_TYPE_ACDC_Mod8_OverVol_ID 		= 110054;			//整流器8过压
-    public final static int ALM_TYPE_ACDC_Mod9_OverVol_ID 		= 110055;			//整流器9过压	
-    public final static int ALM_TYPE_ACDC_Mod10_OverVol_ID 		= 110056;			//整流器10过压
-    public final static int ALM_TYPE_ACDC_Mod11_OverVol_ID 		= 110057;			//整流器11过压
-    public final static int ALM_TYPE_ACDC_Mod12_OverVol_ID 		= 110058;			//整流器12过压
-    public final static int ALM_TYPE_ACDC_Mod13_OverVol_ID 		= 110059;			//整流器13过压
-    public final static int ALM_TYPE_ACDC_Mod14_OverVol_ID 		= 110060;			//整流器14过压
-    public final static int ALM_TYPE_ACDC_Mod15_OverVol_ID 		= 110061;			//整流器15过压
-    public final static int ALM_TYPE_ACDC_Mod16_OverVol_ID 		= 110062;			//整流器16过压
+    public final static int ALM_TYPE_ACDC_Mod1_OverVol_ID 		= 110047;			//整流器1过压告警
+    public final static int ALM_TYPE_ACDC_Mod2_OverVol_ID 		= 110048;			//整流器2过压告警
+    public final static int ALM_TYPE_ACDC_Mod3_OverVol_ID 		= 110049;			//整流器3过压告警
+    public final static int ALM_TYPE_ACDC_Mod4_OverVol_ID 		= 110050;			//整流器4过压告警
+    public final static int ALM_TYPE_ACDC_Mod5_OverVol_ID 		= 110051;			//整流器5过压告警
+    public final static int ALM_TYPE_ACDC_Mod6_OverVol_ID 		= 110052;			//整流器6过压告警
+    public final static int ALM_TYPE_ACDC_Mod7_OverVol_ID 		= 110053;			//整流器7过压告警
+    public final static int ALM_TYPE_ACDC_Mod8_OverVol_ID 		= 110054;			//整流器8过压告警
+    public final static int ALM_TYPE_ACDC_Mod9_OverVol_ID 		= 110055;			//整流器9过压告警
+    public final static int ALM_TYPE_ACDC_Mod10_OverVol_ID 		= 110056;			//整流器10过压告警
+    public final static int ALM_TYPE_ACDC_Mod11_OverVol_ID 		= 110057;			//整流器11过压告警
+    public final static int ALM_TYPE_ACDC_Mod12_OverVol_ID 		= 110058;			//整流器12过压告警
+    public final static int ALM_TYPE_ACDC_Mod13_OverVol_ID 		= 110059;			//整流器13过压告警
+    public final static int ALM_TYPE_ACDC_Mod14_OverVol_ID 		= 110060;			//整流器14过压告警
+    public final static int ALM_TYPE_ACDC_Mod15_OverVol_ID 		= 110061;			//整流器15过压告警
+    public final static int ALM_TYPE_ACDC_Mod16_OverVol_ID 		= 110062;			//整流器16过压告警
 
-    public final static int ALM_TYPE_ACDC_Mod1_UnderVol_ID 		= 110063;			//整流器1欠压
-    public final static int ALM_TYPE_ACDC_Mod2_UnderVol_ID 		= 110064;			//整流器2欠压
-    public final static int ALM_TYPE_ACDC_Mod3_UnderVol_ID 		= 110065;			//整流器3欠压
-    public final static int ALM_TYPE_ACDC_Mod4_UnderVol_ID 		= 110066;			//整流器4欠压
-    public final static int ALM_TYPE_ACDC_Mod5_UnderVol_ID 		= 110067;			//整流器5欠压
-    public final static int ALM_TYPE_ACDC_Mod6_UnderVol_ID 		= 110068;			//整流器6欠压
-    public final static int ALM_TYPE_ACDC_Mod7_UnderVol_ID 		= 110069;			//整流器7欠压
-    public final static int ALM_TYPE_ACDC_Mod8_UnderVol_ID 		= 110070;			//整流器8欠压
-    public final static int ALM_TYPE_ACDC_Mod9_UnderVol_ID 		= 110071;			//整流器9欠压
-    public final static int ALM_TYPE_ACDC_Mod10_UnderVol_ID 	= 110072;			//整流器10欠压
-    public final static int ALM_TYPE_ACDC_Mod11_UnderVol_ID 	= 110073;			//整流器11欠压
-    public final static int ALM_TYPE_ACDC_Mod12_UnderVol_ID 	= 110074;			//整流器12欠压
-    public final static int ALM_TYPE_ACDC_Mod13_UnderVol_ID 	= 110075;			//整流器13欠压
-    public final static int ALM_TYPE_ACDC_Mod14_UnderVol_ID 	= 110076;			//整流器14欠压
-    public final static int ALM_TYPE_ACDC_Mod15_UnderVol_ID 	= 110077;			//整流器15欠压
-    public final static int ALM_TYPE_ACDC_Mod16_UnderVol_ID 	= 110078;			//整流器16欠压
+    public final static int ALM_TYPE_ACDC_Mod1_UnderVol_ID 		= 110063;			//整流器1欠压告警
+    public final static int ALM_TYPE_ACDC_Mod2_UnderVol_ID 		= 110064;			//整流器2欠压告警
+    public final static int ALM_TYPE_ACDC_Mod3_UnderVol_ID 		= 110065;			//整流器3欠压告警
+    public final static int ALM_TYPE_ACDC_Mod4_UnderVol_ID 		= 110066;			//整流器4欠压告警
+    public final static int ALM_TYPE_ACDC_Mod5_UnderVol_ID 		= 110067;			//整流器5欠压告警
+    public final static int ALM_TYPE_ACDC_Mod6_UnderVol_ID 		= 110068;			//整流器6欠压告警
+    public final static int ALM_TYPE_ACDC_Mod7_UnderVol_ID 		= 110069;			//整流器7欠压告警
+    public final static int ALM_TYPE_ACDC_Mod8_UnderVol_ID 		= 110070;			//整流器8欠压告警
+    public final static int ALM_TYPE_ACDC_Mod9_UnderVol_ID 		= 110071;			//整流器9欠压告警
+    public final static int ALM_TYPE_ACDC_Mod10_UnderVol_ID 	= 110072;			//整流器10欠压告警
+    public final static int ALM_TYPE_ACDC_Mod11_UnderVol_ID 	= 110073;			//整流器11欠压告警
+    public final static int ALM_TYPE_ACDC_Mod12_UnderVol_ID 	= 110074;			//整流器12欠压告警
+    public final static int ALM_TYPE_ACDC_Mod13_UnderVol_ID 	= 110075;			//整流器13欠压告警
+    public final static int ALM_TYPE_ACDC_Mod14_UnderVol_ID 	= 110076;			//整流器14欠压告警
+    public final static int ALM_TYPE_ACDC_Mod15_UnderVol_ID 	= 110077;			//整流器15欠压告警
+    public final static int ALM_TYPE_ACDC_Mod16_UnderVol_ID 	= 110078;			//整流器16欠压告警
 
-    public final static int ALM_TYPE_ACDC_Mod1_OverCurr_ID 		= 110079;			//整流器1过流
-    public final static int ALM_TYPE_ACDC_Mod2_OverCurr_ID 		= 110080;			//整流器2过流
-    public final static int ALM_TYPE_ACDC_Mod3_OverCurr_ID 		= 110081;			//整流器3过流
-    public final static int ALM_TYPE_ACDC_Mod4_OverCurr_ID 		= 110082;			//整流器4过流
-    public final static int ALM_TYPE_ACDC_Mod5_OverCurr_ID 		= 110083;			//整流器5过流
-    public final static int ALM_TYPE_ACDC_Mod6_OverCurr_ID 		= 110084;			//整流器6过流
-    public final static int ALM_TYPE_ACDC_Mod7_OverCurr_ID 		= 110085;			//整流器7过流
-    public final static int ALM_TYPE_ACDC_Mod8_OverCurr_ID 		= 110086;			//整流器8过流
-    public final static int ALM_TYPE_ACDC_Mod9_OverCurr_ID 		= 110087;			//整流器9过流
-    public final static int ALM_TYPE_ACDC_Mod10_OverCurr_ID 	= 110088;			//整流器10过流
-    public final static int ALM_TYPE_ACDC_Mod11_OverCurr_ID 	= 110089;			//整流器11过流
-    public final static int ALM_TYPE_ACDC_Mod12_OverCurr_ID 	= 110090;			//整流器12过流
-    public final static int ALM_TYPE_ACDC_Mod13_OverCurr_ID 	= 110091;			//整流器13过流
-    public final static int ALM_TYPE_ACDC_Mod14_OverCurr_ID 	= 110092;			//整流器14过流
-    public final static int ALM_TYPE_ACDC_Mod15_OverCurr_ID 	= 110093;			//整流器15过流
-    public final static int ALM_TYPE_ACDC_Mod16_OverCurr_ID 	= 110094;			//整流器16过流
+    public final static int ALM_TYPE_ACDC_Mod1_OverCurr_ID 		= 110079;			//整流器1过流告警
+    public final static int ALM_TYPE_ACDC_Mod2_OverCurr_ID 		= 110080;			//整流器2过流告警
+    public final static int ALM_TYPE_ACDC_Mod3_OverCurr_ID 		= 110081;			//整流器3过流告警
+    public final static int ALM_TYPE_ACDC_Mod4_OverCurr_ID 		= 110082;			//整流器4过流告警
+    public final static int ALM_TYPE_ACDC_Mod5_OverCurr_ID 		= 110083;			//整流器5过流告警
+    public final static int ALM_TYPE_ACDC_Mod6_OverCurr_ID 		= 110084;			//整流器6过流告警
+    public final static int ALM_TYPE_ACDC_Mod7_OverCurr_ID 		= 110085;			//整流器7过流告警
+    public final static int ALM_TYPE_ACDC_Mod8_OverCurr_ID 		= 110086;			//整流器8过流告警
+    public final static int ALM_TYPE_ACDC_Mod9_OverCurr_ID 		= 110087;			//整流器9过流告警
+    public final static int ALM_TYPE_ACDC_Mod10_OverCurr_ID 	= 110088;			//整流器10过流告警
+    public final static int ALM_TYPE_ACDC_Mod11_OverCurr_ID 	= 110089;			//整流器11过流告警
+    public final static int ALM_TYPE_ACDC_Mod12_OverCurr_ID 	= 110090;			//整流器12过流告警
+    public final static int ALM_TYPE_ACDC_Mod13_OverCurr_ID 	= 110091;			//整流器13过流告警
+    public final static int ALM_TYPE_ACDC_Mod14_OverCurr_ID 	= 110092;			//整流器14过流告警
+    public final static int ALM_TYPE_ACDC_Mod15_OverCurr_ID 	= 110093;			//整流器15过流告警
+    public final static int ALM_TYPE_ACDC_Mod16_OverCurr_ID 	= 110094;			//整流器16过流告警
     
-    public final static int ALM_TYPE_ACDC_Mod1_AC_Err_ID 		= 110095;			//整流器1交流异常
-    public final static int ALM_TYPE_ACDC_Mod2_AC_Err_ID 		= 110096;			//整流器2交流异常
-    public final static int ALM_TYPE_ACDC_Mod3_AC_Err_ID 		= 110097;			//整流器3交流异常
-    public final static int ALM_TYPE_ACDC_Mod4_AC_Err_ID 		= 110098;			//整流器4交流异常
-    public final static int ALM_TYPE_ACDC_Mod5_AC_Err_ID 		= 110099;			//整流器5交流异常
-    public final static int ALM_TYPE_ACDC_Mod6_AC_Err_ID 		= 110100;			//整流器6交流异常
-    public final static int ALM_TYPE_ACDC_Mod7_AC_Err_ID 		= 110101;			//整流器7交流异常
-    public final static int ALM_TYPE_ACDC_Mod8_AC_Err_ID 		= 110102;			//整流器8交流异常
-    public final static int ALM_TYPE_ACDC_Mod9_AC_Err_ID 		= 110103;			//整流器9交流异常
-    public final static int ALM_TYPE_ACDC_Mod10_AC_Err_ID 		= 110104;			//整流器10交流异常
-    public final static int ALM_TYPE_ACDC_Mod11_AC_Err_ID 		= 110105;			//整流器11交流异常
-    public final static int ALM_TYPE_ACDC_Mod12_AC_Err_ID 		= 110106;			//整流器12交流异常
-    public final static int ALM_TYPE_ACDC_Mod13_AC_Err_ID 		= 110107;			//整流器13交流异常
-    public final static int ALM_TYPE_ACDC_Mod14_AC_Err_ID 		= 110108;			//整流器14交流异常
-    public final static int ALM_TYPE_ACDC_Mod15_AC_Err_ID 		= 110109;			//整流器15交流异常
-    public final static int ALM_TYPE_ACDC_Mod16_AC_Err_ID 		= 110110;			//整流器16交流异常
+    public final static int ALM_TYPE_ACDC_Mod1_AC_Err_ID 		= 110095;			//整流器1交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod2_AC_Err_ID 		= 110096;			//整流器2交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod3_AC_Err_ID 		= 110097;			//整流器3交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod4_AC_Err_ID 		= 110098;			//整流器4交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod5_AC_Err_ID 		= 110099;			//整流器5交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod6_AC_Err_ID 		= 110100;			//整流器6交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod7_AC_Err_ID 		= 110101;			//整流器7交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod8_AC_Err_ID 		= 110102;			//整流器8交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod9_AC_Err_ID 		= 110103;			//整流器9交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod10_AC_Err_ID 		= 110104;			//整流器10交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod11_AC_Err_ID 		= 110105;			//整流器11交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod12_AC_Err_ID 		= 110106;			//整流器12交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod13_AC_Err_ID 		= 110107;			//整流器13交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod14_AC_Err_ID 		= 110108;			//整流器14交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod15_AC_Err_ID 		= 110109;			//整流器15交流异常告警
+    public final static int ALM_TYPE_ACDC_Mod16_AC_Err_ID 		= 110110;			//整流器16交流异常告警
 
-    public final static int ALM_TYPE_ACDC_AcIn1_Trip_ID 		= 110111;			//交流输入1跳闸
-    public final static int ALM_TYPE_ACDC_AcIn2_Trip_ID 		= 110112;			//交流输入2跳闸
+    public final static int ALM_TYPE_ACDC_AcIn1_Trip_ID 		= 110111;			//交流输入1跳闸告警
+    public final static int ALM_TYPE_ACDC_AcIn2_Trip_ID 		= 110112;			//交流输入2跳闸告警
     public final static int ALM_TYPE_ACDC_AcIn1_Fuse_ID 		= 110113;			//交流输入1熔丝告警	
     public final static int ALM_TYPE_ACDC_AcIn2_Fuse_ID 		= 110114;			//交流输入2熔丝告警
-    public final static int ALM_TYPE_ACDC_AcIn1_Unbalance_ID 	= 110115;			//交流输入1三相不平衡
-    public final static int ALM_TYPE_ACDC_AcIn2_Unbalance_ID 	= 110116;			//交流输入2三相不平衡
-    public final static int ALM_TYPE_ACDC_AcIn1_FreqErr_ID 		= 110117;			//交流输入1频率异常
-    public final static int ALM_TYPE_ACDC_AcIn2_FreqErr_ID 		= 110118;			//交流输入2频率异常
+    public final static int ALM_TYPE_ACDC_AcIn1_Unbalance_ID 	= 110115;			//交流输入1三相不平衡告警
+    public final static int ALM_TYPE_ACDC_AcIn2_Unbalance_ID 	= 110116;			//交流输入2三相不平衡告警
+    public final static int ALM_TYPE_ACDC_AcIn1_FreqErr_ID 		= 110117;			//交流输入1频率异常告警
+    public final static int ALM_TYPE_ACDC_AcIn2_FreqErr_ID 		= 110118;			//交流输入2频率异常告警
 
     public final static int ALM_TYPE_ACDC_CPSS_CommErr_ID 		= 110119;			//协转通信故障
 
     //1+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     public final static int ALM_TYPE_PWRDEV_CommErr_ID 			= 110120;			//电源通信故障
     		
-    public final static int ALM_TYPE_User_AcIn1_PowerDown_ID 	= 110121;			//交流输入1停电	
-    public final static int ALM_TYPE_User_AcIn2_PowerDown_ID 	= 110122;			//交流输入2停电
+    public final static int ALM_TYPE_User_AcIn1_PowerDown_ID 	= 110121;			//交流输入1停电告警	
+    public final static int ALM_TYPE_User_AcIn2_PowerDown_ID 	= 110122;			//交流输入2停电告警
     public final static int ALM_TYPE_User_AcIn1_CommErr_ID 		= 110123;			//交流1采集通信故障
     public final static int ALM_TYPE_User_AcIn2_CommErr_ID 		= 110124;			//交流2采集通信故障
     public final static int ALM_TYPE_Envm_Temp1_CommErr_ID 		= 110125;			//温感1通信故障
@@ -342,15 +342,15 @@
     public final static int ALM_TYPE_Envm_Smoke2_CommErr_ID 	= 110135;			//烟感2通信故障
     public final static int ALM_TYPE_Envm_Smoke3_CommErr_ID 	= 110136;			//烟感3通信故障
     
-	public final static int ALM_TYPE_ACDC_AcIn1_A_OverV_Second_ID 	 = 110137;		//2路交流A相过压	
-	public final static int ALM_TYPE_ACDC_AcIn1_A_UnderV_Second_ID   = 110138;		//2路交流A相欠压
-	public final static int ALM_TYPE_ACDC_AcIn1_A_Less_Second_ID 	 = 110139;		//2路交流A相缺相
-	public final static int ALM_TYPE_ACDC_AcIn1_B_OverV_Second_ID 	 = 110140;		//2路交流B相过压
-	public final static int ALM_TYPE_ACDC_AcIn1_B_UnderV_Second_ID   = 110141;		//2路交流B相欠压
-	public final static int ALM_TYPE_ACDC_AcIn1_B_Less_Second_ID 	 = 110142;		//2路交流B相缺相
-	public final static int ALM_TYPE_ACDC_AcIn1_C_OverV_Second_ID 	 = 110143;		//2路交流C相过压
-	public final static int ALM_TYPE_ACDC_AcIn1_C_UnderV_Second_ID   = 110144;		//2路交流C相欠压
-	public final static int ALM_TYPE_ACDC_AcIn1_C_Less_Second_ID 	 = 110145;		//2路交流C相缺相
+	public final static int ALM_TYPE_ACDC_AcIn1_A_OverV_Second_ID 	 = 110137;		//2路交流A相过压告警	
+	public final static int ALM_TYPE_ACDC_AcIn1_A_UnderV_Second_ID   = 110138;		//2路交流A相欠压告警
+	public final static int ALM_TYPE_ACDC_AcIn1_A_Less_Second_ID 	 = 110139;		//2路交流A相缺相告警
+	public final static int ALM_TYPE_ACDC_AcIn1_B_OverV_Second_ID 	 = 110140;		//2路交流B相过压告警
+	public final static int ALM_TYPE_ACDC_AcIn1_B_UnderV_Second_ID   = 110141;		//2路交流B相欠压告警
+	public final static int ALM_TYPE_ACDC_AcIn1_B_Less_Second_ID 	 = 110142;		//2路交流B相缺相告警
+	public final static int ALM_TYPE_ACDC_AcIn1_C_OverV_Second_ID 	 = 110143;		//2路交流C相过压告警
+	public final static int ALM_TYPE_ACDC_AcIn1_C_UnderV_Second_ID   = 110144;		//2路交流C相欠压告警
+	public final static int ALM_TYPE_ACDC_AcIn1_C_Less_Second_ID 	 = 110145;		//2路交流C相缺相告警
 	
 	public final static int ALM_TYPE_PWRDEV_ERROR_ID 	 			 = 110146;		//电源告警
 	public final static int ALM_TYPE_ACDC_PowerDown_CommErr_ID 	 	 = 110147;		//交流停电通信故障

--
Gitblit v1.9.1