From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java | 68 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
index f3df074..7ee664b 100644
--- a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
@@ -12,7 +12,7 @@
public static final int Alarm_res_Monomer =119007; //--鍗曚綋鍐呴樆
public static final int Alarm_res_Conn =119008; //--杩炴帴鏉￠樆鎶�
- public final static int ALM_TYPE_DisChargeMonVol_ID = 119009; //--鏀剧數杩囩▼涓惤鍚庡崟浣撳憡璀�
+ public static final int ALM_TYPE_DisChargeMonVol_ID = 119009; //--鏀剧數杩囩▼涓惤鍚庡崟浣撳憡璀�
public static final int Alarm_CapAlarm =119010; //--瀹归噺鍛婅鍛婅
public static final int Alarm_CapChange =119011; //--瀹归噺鏇存崲鍛婅
@@ -21,35 +21,51 @@
public static final int ALM_TYPE_BTS9100S_FADIAN_ComError_ID =119025; //鍩虹珯鍙戠數鍛婅
public static final int ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID =119026; //鍩虹珯鎺夌珯鍛婅
public static final int ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID =119027; //鍩虹珯寮�闂ㄥ憡璀�
- public final static int ALM_TYPE_BTS9100S_TEMPUP_ComError_ID = 119028; //鍩虹珯娓╁害涓婇檺鍛婅
- public final static int ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID = 119029; //鍩虹珯娓╁害涓嬮檺鍛婅
- public final static int ALM_TYPE_BTS9100S_DAMPUP_ComError_ID = 119030; //鍩虹珯婀垮害涓婇檺鍛婅
- public final static int ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID = 119031; //鍩虹珯婀垮害涓嬮檺鍛婅
+ public static final int ALM_TYPE_BTS9100S_TEMPUP_ComError_ID = 119028; //鍩虹珯娓╁害涓婇檺鍛婅
+ public static final int ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID = 119029; //鍩虹珯娓╁害涓嬮檺鍛婅
+ public static final int ALM_TYPE_BTS9100S_DAMPUP_ComError_ID = 119030; //鍩虹珯婀垮害涓婇檺鍛婅
+ public static final int ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID = 119031; //鍩虹珯婀垮害涓嬮檺鍛婅
- public final static int ALM_SIGNAL_ID_Null = 0;
- public final static int ALM_SIGNAL_ID_OnlineVolHigh = 1;
- public final static int ALM_SIGNAL_ID_OnlineVolLow = 2;
- public final static int ALM_SIGNAL_ID_GroupVolHigh = 3;
- public final static int ALM_SIGNAL_ID_GroupVolLow = 4;
- public final static int ALM_SIGNAL_ID_ChargeCurrHigh = 5;
- public final static int ALM_SIGNAL_ID_ChargeCurrLow = 6;
- public final static int ALM_SIGNAL_ID_DisChargeCurrHigh = 7;
- public final static int ALM_SIGNAL_ID_DisChargeCurrLow = 8;
- public final static int ALM_SIGNAL_ID_MonVolHigh = 9;
- public final static int ALM_SIGNAL_ID_MonVolLow = 10;
- public final static int ALM_SIGNAL_ID_MonTmpHigh = 11;
- public final static int ALM_SIGNAL_ID_MonTmpLow = 12;
- public final static int ALM_SIGNAL_ID_MonResHigh = 13;
- public final static int ALM_SIGNAL_ID_MonResLow = 14;
- public final static int ALM_SIGNAL_ID_ConnResHigh = 15;
- public final static int ALM_SIGNAL_ID_ConnResLow = 16;
- public final static int ALM_SIGNAL_ID_DischargeMonVolHigh = 17;
- public final static int ALM_SIGNAL_ID_DischargeMonVolLow = 18;
+ public static final int ALM_TYPE_FBS9100_SDERROR_ID = 119032; //璁惧SD鍗℃晠闅�
+ public static final int ALM_TYPE_FBS9100_COLLECTERROR_ID = 119033; //閲囬泦绾垮憡璀�
+
+
+ public static final int STATION_EVENT_TYPE_POFF=1; //鍩虹珯鍋滅數
+ public static final int STATION_EVENT_TYPE_XUHANG=2; //鍩虹珯缁埅
+ public static final int STATION_EVENT_TYPE_FADIAN=3; //鍩虹珯鍙戠數
+ public static final int STATION_EVENT_TYPE_DOOROPEN=4; //鍩虹珯寮�闂�
+ public static final int STATION_EVENT_TYPE_DIAOZHAN=5; //鍩虹珯鎺夌珯
+ public static final int STATION_EVENT_TYPE_TEMPUP=6; //鍩虹珯娓╁害涓婇檺
+ public static final int STATION_EVENT_TYPE_TEMPLOW=7; //鍩虹珯娓╁害涓嬮檺
+ public static final int STATION_EVENT_TYPE_DAMPUP=8; //鍩虹珯婀垮害涓婇檺
+ public static final int STATION_EVENT_TYPE_DAMPLOW=9; //鍩虹珯婀垮害涓嬮檺
+
+
+ public static final int ALM_SIGNAL_ID_Null = 0;
+ public static final int ALM_SIGNAL_ID_OnlineVolHigh = 1;
+ public static final int ALM_SIGNAL_ID_OnlineVolLow = 2;
+ public static final int ALM_SIGNAL_ID_GroupVolHigh = 3;
+ public static final int ALM_SIGNAL_ID_GroupVolLow = 4;
+ public static final int ALM_SIGNAL_ID_ChargeCurrHigh = 5;
+ public static final int ALM_SIGNAL_ID_ChargeCurrLow = 6;
+ public static final int ALM_SIGNAL_ID_DisChargeCurrHigh = 7;
+ public static final int ALM_SIGNAL_ID_DisChargeCurrLow = 8;
+ public static final int ALM_SIGNAL_ID_MonVolHigh = 9;
+ public static final int ALM_SIGNAL_ID_MonVolLow = 10;
+ public static final int ALM_SIGNAL_ID_MonTmpHigh = 11;
+ public static final int ALM_SIGNAL_ID_MonTmpLow = 12;
+ public static final int ALM_SIGNAL_ID_MonResHigh = 13;
+ public static final int ALM_SIGNAL_ID_MonResLow = 14;
+ public static final int ALM_SIGNAL_ID_ConnResHigh = 15;
+ public static final int ALM_SIGNAL_ID_ConnResLow = 16;
+ public static final int ALM_SIGNAL_ID_DischargeMonVolHigh = 17;
+ public static final int ALM_SIGNAL_ID_DischargeMonVolLow = 18;
public static final int Alarm_IGNAL_ID_CapAlarmLow =19;
public static final int Alarm_IGNAL_ID_CapAlarmHigh =20;
public static final int Alarm_IGNAL_ID_CapChangeLow =21;
public static final int Alarm_IGNAL_ID_CapChangeHigh =22;
+ public static final int alarm_voice_timelong=30;//璇煶鎾姤鐨勬椂闂撮棿闅�
public static String getAlarmName(int type)
{
@@ -111,7 +127,9 @@
case 618502 : dev_name = "閫氳鍛婅";break;
case 618503 : dev_name = "璁惧杩囨俯鍛婅";break;
case 618504 : dev_name = "浜屾瀬绠1鍛婅";break;
-
+ case 119028 : dev_name = "璁惧楂樻俯鍛婅";break;
+ case 119032 : dev_name = "璁惧SD鍗℃晠闅�";break;
+ case 119033 : dev_name = "閲囬泦绾垮憡璀�";break;
}
return dev_name;
--
Gitblit v1.9.1