From ab7d139745ab0e1d447c1d7e9e74e8c590636922 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 十二月 2018 14:15:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
index 56ebbc2..7ee664b 100644
--- a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
@@ -26,6 +26,10 @@
public static final int ALM_TYPE_BTS9100S_DAMPUP_ComError_ID = 119030; //鍩虹珯婀垮害涓婇檺鍛婅
public static final int ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID = 119031; //鍩虹珯婀垮害涓嬮檺鍛婅
+ 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; //鍩虹珯鍙戠數
@@ -61,7 +65,7 @@
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=3000;//璇煶鎾姤鐨勬椂闂撮棿闅�
+ public static final int alarm_voice_timelong=30;//璇煶鎾姤鐨勬椂闂撮棿闅�
public static String getAlarmName(int type)
{
@@ -123,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