From 71ab093be46f062bb580c0a97df50b9774b9e330 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.8>
Date: 星期一, 29 十月 2018 17:27:19 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 2 +-
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 2 +-
gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
index d3c744d..56ebbc2 100644
--- a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
@@ -61,6 +61,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 String getAlarmName(int type)
{
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
index 18e5c89..5ee815b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -589,7 +589,7 @@
" from db_alarm.tb_devalarm_data,db_battinf.tb_battinf" +
" where alm_cleared_type=0 " +
" and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
- " and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<30 " ;
+ " and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong ;
//鐢ㄦ埛绠＄悊
String userSql=" and tb_battinf.StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index 5fca417..d1e2c23 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1822,7 +1822,7 @@
" where alm_cleared_type=0 " +
" and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid " +
" and alm_id not in("+AlarmDaoFactory.Alarm_vol_Online+","+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+") " +
- " and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<30 ";
+ " and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong;
//鐢ㄦ埛绠＄悊
String userSql=" and tb_battinf.StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
--
Gitblit v1.9.1