diff --git a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java index ce9ee0f..043aed9 100644 --- a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java @@ -156,7 +156,7 @@ return null; } } catch (Exception ex) { - logger.error("根据设备查询最新报警记录成功", ex); + logger.error("根据设备查询最新报警记录失败", ex); return null; } finally { try { diff --git a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java index ce9ee0f..043aed9 100644 --- a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java @@ -156,7 +156,7 @@ return null; } } catch (Exception ex) { - logger.error("根据设备查询最新报警记录成功", ex); + logger.error("根据设备查询最新报警记录失败", ex); return null; } finally { try { diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 13c5968..04b9b7e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean CH4_ON_FJ = false; - private long CLASS_YELLOW_ALARM_INTERVAL = 360 * 60 * 1000L; + private boolean CH4_ON_FJ; + private long CLASS_YELLOW_ALARM_INTERVAL; public ReadCH4ValueCommandResponse() { jwnd = new ArrayList(); jwldbjz = new ArrayList(); + + CH4_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_YELLOW_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_YELLOW_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getJwnd() { diff --git a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java index ce9ee0f..043aed9 100644 --- a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java @@ -156,7 +156,7 @@ return null; } } catch (Exception ex) { - logger.error("根据设备查询最新报警记录成功", ex); + logger.error("根据设备查询最新报警记录失败", ex); return null; } finally { try { diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 13c5968..04b9b7e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean CH4_ON_FJ = false; - private long CLASS_YELLOW_ALARM_INTERVAL = 360 * 60 * 1000L; + private boolean CH4_ON_FJ; + private long CLASS_YELLOW_ALARM_INTERVAL; public ReadCH4ValueCommandResponse() { jwnd = new ArrayList(); jwldbjz = new ArrayList(); + + CH4_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_YELLOW_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_YELLOW_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getJwnd() { diff --git a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java index 0b27d03..a45a716 100644 --- a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java @@ -48,12 +48,15 @@ */ private String[] zcList; - private boolean CO_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean CO_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadCOValueCommandResponse() { cond = new ArrayList(); coldbjz = new ArrayList(); + + CO_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_RED_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_RED_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getCond() { diff --git a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java index ce9ee0f..043aed9 100644 --- a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java @@ -156,7 +156,7 @@ return null; } } catch (Exception ex) { - logger.error("根据设备查询最新报警记录成功", ex); + logger.error("根据设备查询最新报警记录失败", ex); return null; } finally { try { diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 13c5968..04b9b7e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean CH4_ON_FJ = false; - private long CLASS_YELLOW_ALARM_INTERVAL = 360 * 60 * 1000L; + private boolean CH4_ON_FJ; + private long CLASS_YELLOW_ALARM_INTERVAL; public ReadCH4ValueCommandResponse() { jwnd = new ArrayList(); jwldbjz = new ArrayList(); + + CH4_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_YELLOW_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_YELLOW_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getJwnd() { diff --git a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java index 0b27d03..a45a716 100644 --- a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java @@ -48,12 +48,15 @@ */ private String[] zcList; - private boolean CO_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean CO_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadCOValueCommandResponse() { cond = new ArrayList(); coldbjz = new ArrayList(); + + CO_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_RED_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_RED_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getCond() { diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index 1980827..2cfb318 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean HS_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean HS_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadHSValueCommandResponse() { hsnd = new ArrayList(); hsldbjz = new ArrayList(); + + HS_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_RED_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_RED_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getHsnd() { diff --git a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java index ce9ee0f..043aed9 100644 --- a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java @@ -156,7 +156,7 @@ return null; } } catch (Exception ex) { - logger.error("根据设备查询最新报警记录成功", ex); + logger.error("根据设备查询最新报警记录失败", ex); return null; } finally { try { diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 13c5968..04b9b7e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean CH4_ON_FJ = false; - private long CLASS_YELLOW_ALARM_INTERVAL = 360 * 60 * 1000L; + private boolean CH4_ON_FJ; + private long CLASS_YELLOW_ALARM_INTERVAL; public ReadCH4ValueCommandResponse() { jwnd = new ArrayList(); jwldbjz = new ArrayList(); + + CH4_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_YELLOW_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_YELLOW_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getJwnd() { diff --git a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java index 0b27d03..a45a716 100644 --- a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java @@ -48,12 +48,15 @@ */ private String[] zcList; - private boolean CO_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean CO_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadCOValueCommandResponse() { cond = new ArrayList(); coldbjz = new ArrayList(); + + CO_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_RED_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_RED_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getCond() { diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index 1980827..2cfb318 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean HS_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean HS_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadHSValueCommandResponse() { hsnd = new ArrayList(); hsldbjz = new ArrayList(); + + HS_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_RED_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_RED_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getHsnd() { diff --git a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java index ebeb051..744d0bd 100644 --- a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java @@ -47,8 +47,8 @@ */ private String[] zcList; - private boolean O2_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean O2_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadO2ValueCommandResponse() { o2nd = new ArrayList(); diff --git a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java index ce9ee0f..043aed9 100644 --- a/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAlarmDaoImpl.java @@ -156,7 +156,7 @@ return null; } } catch (Exception ex) { - logger.error("根据设备查询最新报警记录成功", ex); + logger.error("根据设备查询最新报警记录失败", ex); return null; } finally { try { diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 13c5968..04b9b7e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean CH4_ON_FJ = false; - private long CLASS_YELLOW_ALARM_INTERVAL = 360 * 60 * 1000L; + private boolean CH4_ON_FJ; + private long CLASS_YELLOW_ALARM_INTERVAL; public ReadCH4ValueCommandResponse() { jwnd = new ArrayList(); jwldbjz = new ArrayList(); + + CH4_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_YELLOW_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_YELLOW_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getJwnd() { diff --git a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java index 0b27d03..a45a716 100644 --- a/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCOValueCommandResponse.java @@ -48,12 +48,15 @@ */ private String[] zcList; - private boolean CO_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean CO_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadCOValueCommandResponse() { cond = new ArrayList(); coldbjz = new ArrayList(); + + CO_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_RED_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_RED_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getCond() { diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index 1980827..2cfb318 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -53,12 +53,15 @@ */ private String[] zcList; - private boolean HS_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean HS_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadHSValueCommandResponse() { hsnd = new ArrayList(); hsldbjz = new ArrayList(); + + HS_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")); + CLASS_RED_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_RED_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getHsnd() { diff --git a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java index ebeb051..744d0bd 100644 --- a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java @@ -47,8 +47,8 @@ */ private String[] zcList; - private boolean O2_ON_FJ = false; - private long CLASS_RED_ALARM_INTERVAL = 60 * 60 * 1000L; + private boolean O2_ON_FJ; + private long CLASS_RED_ALARM_INTERVAL; public ReadO2ValueCommandResponse() { o2nd = new ArrayList(); diff --git a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java index db6af74..19f741e 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java @@ -63,15 +63,17 @@ */ private String[] zcList; - private boolean WD_ON_FJ = false; - private boolean SD_ON_FJ = false; - private long CLASS_YELLOW_ALARM_INTERVAL = 360 * 60 * 1000L; + private boolean WD_ON_FJ; + private long CLASS_YELLOW_ALARM_INTERVAL; public ReadWSValueCommandResponse() { wd = new ArrayList(); sd = new ArrayList(); wdbjz = new ArrayList(); sdbjz = new ArrayList(); + + WD_ON_FJ = Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")); + CLASS_YELLOW_ALARM_INTERVAL = Integer.parseInt(Configure.getProperty("sys", "CLASS_YELLOW_ALARM_INTERVAL", "60")) * 60 * 1000L; } public List getWd() { @@ -235,7 +237,7 @@ ex.printStackTrace(); } - if (Math.abs(wdValue - lastHumAlarmValue) < 0.01 && humAlarmTimeInterval < CLASS_YELLOW_ALARM_INTERVAL) { + if (Math.abs(sdValue - lastHumAlarmValue) < 0.01 && humAlarmTimeInterval < CLASS_YELLOW_ALARM_INTERVAL) { insertAlarmFlag = false; } }