diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java index 425d940..49396dc 100644 --- a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -124,6 +125,9 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + dsbj = Arrays.asList(new Boolean[zcList.length]); // 解析红外对射报警状态 for (int i = 0; i < zcList.length; i++) { @@ -138,12 +142,14 @@ int akszdz = almBlObj.getKszdz(); //开始字地址 int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 红外对射报警状态标志位 - - getDsbj().add(bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 红外对射报警状态标志位 + getDsbj().set(i, bjBt == '1' ? true : false); + + logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + } } logger.info("解析[读取舱段对射报警状态]响应指令结束"); diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java index 425d940..49396dc 100644 --- a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -124,6 +125,9 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + dsbj = Arrays.asList(new Boolean[zcList.length]); // 解析红外对射报警状态 for (int i = 0; i < zcList.length; i++) { @@ -138,12 +142,14 @@ int akszdz = almBlObj.getKszdz(); //开始字地址 int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 红外对射报警状态标志位 - - getDsbj().add(bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 红外对射报警状态标志位 + getDsbj().set(i, bjBt == '1' ? true : false); + + logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + } } logger.info("解析[读取舱段对射报警状态]响应指令结束"); diff --git a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java index f9b138f..30ec9da 100644 --- a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java @@ -160,8 +160,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - getFjRun().set(i, runBt == '1' ? true : false); + int indexRun = dataStr.length() - 1 - roffset * 16 - rbit; + if (indexRun >= 0) { + char runBt = dataStr.charAt(indexRun); // 风机运行状态标志位 + getFjRun().set(i, runBt == '1' ? true : false); + } } // 解析风机故障报警状态 @@ -171,8 +174,11 @@ int foffset = fkszdz - start; //与开始字的偏移量 int fbit = fltBlObj.getSzw(); //所在位 - char fltBt = dataStr.charAt(dataStr.length() - 1 - foffset * 16 - fbit); // 风机故障报警标志位 - getFjFlt().set(i, fltBt == '1' ? true : false); + int indexFlt = dataStr.length() - 1 - foffset * 16 - fbit; + if (indexFlt >= 0) { + char fltBt = dataStr.charAt(indexFlt); // 风机故障报警标志位 + getFjFlt().set(i, fltBt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java index 425d940..49396dc 100644 --- a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -124,6 +125,9 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + dsbj = Arrays.asList(new Boolean[zcList.length]); // 解析红外对射报警状态 for (int i = 0; i < zcList.length; i++) { @@ -138,12 +142,14 @@ int akszdz = almBlObj.getKszdz(); //开始字地址 int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 红外对射报警状态标志位 - - getDsbj().add(bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 红外对射报警状态标志位 + getDsbj().set(i, bjBt == '1' ? true : false); + + logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + } } logger.info("解析[读取舱段对射报警状态]响应指令结束"); diff --git a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java index f9b138f..30ec9da 100644 --- a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java @@ -160,8 +160,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - getFjRun().set(i, runBt == '1' ? true : false); + int indexRun = dataStr.length() - 1 - roffset * 16 - rbit; + if (indexRun >= 0) { + char runBt = dataStr.charAt(indexRun); // 风机运行状态标志位 + getFjRun().set(i, runBt == '1' ? true : false); + } } // 解析风机故障报警状态 @@ -171,8 +174,11 @@ int foffset = fkszdz - start; //与开始字的偏移量 int fbit = fltBlObj.getSzw(); //所在位 - char fltBt = dataStr.charAt(dataStr.length() - 1 - foffset * 16 - fbit); // 风机故障报警标志位 - getFjFlt().set(i, fltBt == '1' ? true : false); + int indexFlt = dataStr.length() - 1 - foffset * 16 - fbit; + if (indexFlt >= 0) { + char fltBt = dataStr.charAt(indexFlt); // 风机故障报警标志位 + getFjFlt().set(i, fltBt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java index b76ad87..2d2b5a9 100644 --- a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -132,6 +133,12 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + jgdk = Arrays.asList(new Boolean[zcList.length]); + jggb = Arrays.asList(new Boolean[zcList.length]); + jgsd = Arrays.asList(new Boolean[zcList.length]); + jgzt = Arrays.asList(new String[zcList.length]); // 解析井盖状态 for (int i = 0; i < zcList.length; i++) { @@ -151,22 +158,27 @@ int ckszdz = closeBlObj.getKszdz(); //开始字地址 int coffset = ckszdz - start; //与开始字的偏移量 int cbit = closeBlObj.getSzw(); //所在位 - - char openBt = dataStr.charAt(dataStr.length() - 1 - ooffset * 16 - obit); // 井盖开到位标志位 - char closeBt = dataStr.charAt(dataStr.length() - 1 - coffset * 16 - cbit); // 井盖关到位标志位 - - getJgdk().add(openBt == '0' ? true : false); //1-开到位，0-未开到位 - getJggb().add(closeBt == '0' ? true : false); //1-关到位，0-未关到位 - - // 判断井盖打开状态 - if (openBt == '0' && closeBt == '0') { - getJgzt().add("半开半闭"); //半开半闭 - } else if (openBt == '1' && closeBt == '0') { - getJgzt().add("全开"); //全开 - } else if (openBt == '0' && closeBt == '1') { - getJgzt().add("全关"); //全关 - } else { - getJgzt().add("数值异常"); //数值异常 + + int indexOpen = dataStr.length() - 1 - ooffset * 16 - obit; + int indexClose = dataStr.length() - 1 - coffset * 16 - cbit; + if (indexOpen >= 0 && indexClose >= 0) { + + char openBt = dataStr.charAt(indexOpen); // 井盖开到位标志位 + char closeBt = dataStr.charAt(indexClose); // 井盖关到位标志位 + + getJgdk().set(i, openBt == '0' ? true : false); //1-开到位，0-未开到位 + getJggb().set(i, closeBt == '0' ? true : false); //1-关到位，0-未关到位 + + // 判断井盖打开状态 + if (openBt == '0' && closeBt == '0') { + getJgzt().set(i, "半开半闭"); //半开半闭 + } else if (openBt == '1' && closeBt == '0') { + getJgzt().set(i, "全开"); //全开 + } else if (openBt == '0' && closeBt == '1') { + getJgzt().set(i, "全关"); //全关 + } else { + getJgzt().set(i, "数值异常"); //数值异常 + } } // 解析井盖锁定/解锁状态 @@ -178,10 +190,12 @@ int lkszdz = lockBlObj.getKszdz(); //开始字地址 int loffset = lkszdz - start; //与开始字的偏移量 int lbit = lockBlObj.getSzw(); //所在位 - - char lockBt = dataStr.charAt(dataStr.length() - 1 - loffset * 16 - lbit); // 井盖解锁/锁定标志位 - - getJgsd().add(lockBt == '0' ? true : false); //0-锁定;1-解锁 + + int indexLock = dataStr.length() - 1 - loffset * 16 - lbit; + if (indexLock >= 0) { + char lockBt = dataStr.charAt(indexLock); // 井盖解锁/锁定标志位 + getJgsd().set(i, lockBt == '0' ? true : false); //0-锁定;1-解锁 + } logger.info("[" + zcbh + "][井盖状态" + getJgzt().get(i) + "][井盖锁定" + getJgsd().get(i) + "]"); } diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java index 425d940..49396dc 100644 --- a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -124,6 +125,9 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + dsbj = Arrays.asList(new Boolean[zcList.length]); // 解析红外对射报警状态 for (int i = 0; i < zcList.length; i++) { @@ -138,12 +142,14 @@ int akszdz = almBlObj.getKszdz(); //开始字地址 int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 红外对射报警状态标志位 - - getDsbj().add(bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 红外对射报警状态标志位 + getDsbj().set(i, bjBt == '1' ? true : false); + + logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + } } logger.info("解析[读取舱段对射报警状态]响应指令结束"); diff --git a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java index f9b138f..30ec9da 100644 --- a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java @@ -160,8 +160,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - getFjRun().set(i, runBt == '1' ? true : false); + int indexRun = dataStr.length() - 1 - roffset * 16 - rbit; + if (indexRun >= 0) { + char runBt = dataStr.charAt(indexRun); // 风机运行状态标志位 + getFjRun().set(i, runBt == '1' ? true : false); + } } // 解析风机故障报警状态 @@ -171,8 +174,11 @@ int foffset = fkszdz - start; //与开始字的偏移量 int fbit = fltBlObj.getSzw(); //所在位 - char fltBt = dataStr.charAt(dataStr.length() - 1 - foffset * 16 - fbit); // 风机故障报警标志位 - getFjFlt().set(i, fltBt == '1' ? true : false); + int indexFlt = dataStr.length() - 1 - foffset * 16 - fbit; + if (indexFlt >= 0) { + char fltBt = dataStr.charAt(indexFlt); // 风机故障报警标志位 + getFjFlt().set(i, fltBt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java index b76ad87..2d2b5a9 100644 --- a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -132,6 +133,12 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + jgdk = Arrays.asList(new Boolean[zcList.length]); + jggb = Arrays.asList(new Boolean[zcList.length]); + jgsd = Arrays.asList(new Boolean[zcList.length]); + jgzt = Arrays.asList(new String[zcList.length]); // 解析井盖状态 for (int i = 0; i < zcList.length; i++) { @@ -151,22 +158,27 @@ int ckszdz = closeBlObj.getKszdz(); //开始字地址 int coffset = ckszdz - start; //与开始字的偏移量 int cbit = closeBlObj.getSzw(); //所在位 - - char openBt = dataStr.charAt(dataStr.length() - 1 - ooffset * 16 - obit); // 井盖开到位标志位 - char closeBt = dataStr.charAt(dataStr.length() - 1 - coffset * 16 - cbit); // 井盖关到位标志位 - - getJgdk().add(openBt == '0' ? true : false); //1-开到位，0-未开到位 - getJggb().add(closeBt == '0' ? true : false); //1-关到位，0-未关到位 - - // 判断井盖打开状态 - if (openBt == '0' && closeBt == '0') { - getJgzt().add("半开半闭"); //半开半闭 - } else if (openBt == '1' && closeBt == '0') { - getJgzt().add("全开"); //全开 - } else if (openBt == '0' && closeBt == '1') { - getJgzt().add("全关"); //全关 - } else { - getJgzt().add("数值异常"); //数值异常 + + int indexOpen = dataStr.length() - 1 - ooffset * 16 - obit; + int indexClose = dataStr.length() - 1 - coffset * 16 - cbit; + if (indexOpen >= 0 && indexClose >= 0) { + + char openBt = dataStr.charAt(indexOpen); // 井盖开到位标志位 + char closeBt = dataStr.charAt(indexClose); // 井盖关到位标志位 + + getJgdk().set(i, openBt == '0' ? true : false); //1-开到位，0-未开到位 + getJggb().set(i, closeBt == '0' ? true : false); //1-关到位，0-未关到位 + + // 判断井盖打开状态 + if (openBt == '0' && closeBt == '0') { + getJgzt().set(i, "半开半闭"); //半开半闭 + } else if (openBt == '1' && closeBt == '0') { + getJgzt().set(i, "全开"); //全开 + } else if (openBt == '0' && closeBt == '1') { + getJgzt().set(i, "全关"); //全关 + } else { + getJgzt().set(i, "数值异常"); //数值异常 + } } // 解析井盖锁定/解锁状态 @@ -178,10 +190,12 @@ int lkszdz = lockBlObj.getKszdz(); //开始字地址 int loffset = lkszdz - start; //与开始字的偏移量 int lbit = lockBlObj.getSzw(); //所在位 - - char lockBt = dataStr.charAt(dataStr.length() - 1 - loffset * 16 - lbit); // 井盖解锁/锁定标志位 - - getJgsd().add(lockBt == '0' ? true : false); //0-锁定;1-解锁 + + int indexLock = dataStr.length() - 1 - loffset * 16 - lbit; + if (indexLock >= 0) { + char lockBt = dataStr.charAt(indexLock); // 井盖解锁/锁定标志位 + getJgsd().set(i, lockBt == '0' ? true : false); //0-锁定;1-解锁 + } logger.info("[" + zcbh + "][井盖状态" + getJgzt().get(i) + "][井盖锁定" + getJgsd().get(i) + "]"); } diff --git a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java index 081f7d8..cf5c600 100644 --- a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java @@ -102,11 +102,15 @@ if (deviceId > 0) { // 根据是否有数据来判断单泵还是双泵 if (null == sb2Run.get(i)) { - logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } else { - logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } // 如果单泵或者双泵有任意一个故障则都报警 @@ -188,8 +192,11 @@ int r1offset = r1kszdz - start; // 与开始字的偏移量 int r1bit = run1BlObj.getSzw(); // 所在位 - char run1Bt = dataStr.charAt(dataStr.length() - 1 - r1offset * 16 - r1bit); // 水泵1运行状态标志位 - getSb1Run().set(i, run1Bt == '1' ? true : false); + int indexRun1 = dataStr.length() - 1 - r1offset * 16 - r1bit; + if (indexRun1 >= 0) { + char run1Bt = dataStr.charAt(indexRun1); // 水泵1运行状态标志位 + getSb1Run().set(i, run1Bt == '1' ? true : false); + } } // 解析水泵2运行状态 @@ -199,8 +206,11 @@ int r2offset = r2kszdz - start; // 与开始字的偏移量 int r2bit = run2BlObj.getSzw(); // 所在位 - char run2Bt = dataStr.charAt(dataStr.length() - 1 - r2offset * 16 - r2bit); // 水泵2运行状态标志位 - getSb2Run().set(i, run2Bt == '1' ? true : false); + int indexRun2 = dataStr.length() - 1 - r2offset * 16 - r2bit; + if (indexRun2 >= 0) { + char run2Bt = dataStr.charAt(indexRun2); // 水泵2运行状态标志位 + getSb2Run().set(i, run2Bt == '1' ? true : false); + } } // 解析水泵1故障报警状态 @@ -210,8 +220,11 @@ int f1offset = f1kszdz - start; // 与开始字的偏移量 int f1bit = flt1BlObj.getSzw(); // 所在位 - char flt1Bt = dataStr.charAt(dataStr.length() - 1 - f1offset * 16 - f1bit); // 水泵1故障报警标志位 - getSb1Flt().set(i, flt1Bt == '1' ? true : false); + int indexFlt1 = dataStr.length() - 1 - f1offset * 16 - f1bit; + if (indexFlt1 >= 0) { + char flt1Bt = dataStr.charAt(indexFlt1); // 水泵1故障报警标志位 + getSb1Flt().set(i, flt1Bt == '1' ? true : false); + } } // 解析水泵2故障报警状态 @@ -221,8 +234,11 @@ int f2offset = f2kszdz - start; // 与开始字的偏移量 int f2bit = flt2BlObj.getSzw(); // 所在位 - char flt2Bt = dataStr.charAt(dataStr.length() - 1 - f2offset * 16 - f2bit); // 水泵1故障报警标志位 - getSb2Flt().set(i, flt2Bt == '1' ? true : false); + int indexFlt2 = dataStr.length() - 1 - f2offset * 16 - f2bit; + if (indexFlt2 >= 0) { + char flt2Bt = dataStr.charAt(indexFlt2); // 水泵1故障报警标志位 + getSb2Flt().set(i, flt2Bt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java index 425d940..49396dc 100644 --- a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -124,6 +125,9 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + dsbj = Arrays.asList(new Boolean[zcList.length]); // 解析红外对射报警状态 for (int i = 0; i < zcList.length; i++) { @@ -138,12 +142,14 @@ int akszdz = almBlObj.getKszdz(); //开始字地址 int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 红外对射报警状态标志位 - - getDsbj().add(bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 红外对射报警状态标志位 + getDsbj().set(i, bjBt == '1' ? true : false); + + logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + } } logger.info("解析[读取舱段对射报警状态]响应指令结束"); diff --git a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java index f9b138f..30ec9da 100644 --- a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java @@ -160,8 +160,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - getFjRun().set(i, runBt == '1' ? true : false); + int indexRun = dataStr.length() - 1 - roffset * 16 - rbit; + if (indexRun >= 0) { + char runBt = dataStr.charAt(indexRun); // 风机运行状态标志位 + getFjRun().set(i, runBt == '1' ? true : false); + } } // 解析风机故障报警状态 @@ -171,8 +174,11 @@ int foffset = fkszdz - start; //与开始字的偏移量 int fbit = fltBlObj.getSzw(); //所在位 - char fltBt = dataStr.charAt(dataStr.length() - 1 - foffset * 16 - fbit); // 风机故障报警标志位 - getFjFlt().set(i, fltBt == '1' ? true : false); + int indexFlt = dataStr.length() - 1 - foffset * 16 - fbit; + if (indexFlt >= 0) { + char fltBt = dataStr.charAt(indexFlt); // 风机故障报警标志位 + getFjFlt().set(i, fltBt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java index b76ad87..2d2b5a9 100644 --- a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -132,6 +133,12 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + jgdk = Arrays.asList(new Boolean[zcList.length]); + jggb = Arrays.asList(new Boolean[zcList.length]); + jgsd = Arrays.asList(new Boolean[zcList.length]); + jgzt = Arrays.asList(new String[zcList.length]); // 解析井盖状态 for (int i = 0; i < zcList.length; i++) { @@ -151,22 +158,27 @@ int ckszdz = closeBlObj.getKszdz(); //开始字地址 int coffset = ckszdz - start; //与开始字的偏移量 int cbit = closeBlObj.getSzw(); //所在位 - - char openBt = dataStr.charAt(dataStr.length() - 1 - ooffset * 16 - obit); // 井盖开到位标志位 - char closeBt = dataStr.charAt(dataStr.length() - 1 - coffset * 16 - cbit); // 井盖关到位标志位 - - getJgdk().add(openBt == '0' ? true : false); //1-开到位，0-未开到位 - getJggb().add(closeBt == '0' ? true : false); //1-关到位，0-未关到位 - - // 判断井盖打开状态 - if (openBt == '0' && closeBt == '0') { - getJgzt().add("半开半闭"); //半开半闭 - } else if (openBt == '1' && closeBt == '0') { - getJgzt().add("全开"); //全开 - } else if (openBt == '0' && closeBt == '1') { - getJgzt().add("全关"); //全关 - } else { - getJgzt().add("数值异常"); //数值异常 + + int indexOpen = dataStr.length() - 1 - ooffset * 16 - obit; + int indexClose = dataStr.length() - 1 - coffset * 16 - cbit; + if (indexOpen >= 0 && indexClose >= 0) { + + char openBt = dataStr.charAt(indexOpen); // 井盖开到位标志位 + char closeBt = dataStr.charAt(indexClose); // 井盖关到位标志位 + + getJgdk().set(i, openBt == '0' ? true : false); //1-开到位，0-未开到位 + getJggb().set(i, closeBt == '0' ? true : false); //1-关到位，0-未关到位 + + // 判断井盖打开状态 + if (openBt == '0' && closeBt == '0') { + getJgzt().set(i, "半开半闭"); //半开半闭 + } else if (openBt == '1' && closeBt == '0') { + getJgzt().set(i, "全开"); //全开 + } else if (openBt == '0' && closeBt == '1') { + getJgzt().set(i, "全关"); //全关 + } else { + getJgzt().set(i, "数值异常"); //数值异常 + } } // 解析井盖锁定/解锁状态 @@ -178,10 +190,12 @@ int lkszdz = lockBlObj.getKszdz(); //开始字地址 int loffset = lkszdz - start; //与开始字的偏移量 int lbit = lockBlObj.getSzw(); //所在位 - - char lockBt = dataStr.charAt(dataStr.length() - 1 - loffset * 16 - lbit); // 井盖解锁/锁定标志位 - - getJgsd().add(lockBt == '0' ? true : false); //0-锁定;1-解锁 + + int indexLock = dataStr.length() - 1 - loffset * 16 - lbit; + if (indexLock >= 0) { + char lockBt = dataStr.charAt(indexLock); // 井盖解锁/锁定标志位 + getJgsd().set(i, lockBt == '0' ? true : false); //0-锁定;1-解锁 + } logger.info("[" + zcbh + "][井盖状态" + getJgzt().get(i) + "][井盖锁定" + getJgsd().get(i) + "]"); } diff --git a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java index 081f7d8..cf5c600 100644 --- a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java @@ -102,11 +102,15 @@ if (deviceId > 0) { // 根据是否有数据来判断单泵还是双泵 if (null == sb2Run.get(i)) { - logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } else { - logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } // 如果单泵或者双泵有任意一个故障则都报警 @@ -188,8 +192,11 @@ int r1offset = r1kszdz - start; // 与开始字的偏移量 int r1bit = run1BlObj.getSzw(); // 所在位 - char run1Bt = dataStr.charAt(dataStr.length() - 1 - r1offset * 16 - r1bit); // 水泵1运行状态标志位 - getSb1Run().set(i, run1Bt == '1' ? true : false); + int indexRun1 = dataStr.length() - 1 - r1offset * 16 - r1bit; + if (indexRun1 >= 0) { + char run1Bt = dataStr.charAt(indexRun1); // 水泵1运行状态标志位 + getSb1Run().set(i, run1Bt == '1' ? true : false); + } } // 解析水泵2运行状态 @@ -199,8 +206,11 @@ int r2offset = r2kszdz - start; // 与开始字的偏移量 int r2bit = run2BlObj.getSzw(); // 所在位 - char run2Bt = dataStr.charAt(dataStr.length() - 1 - r2offset * 16 - r2bit); // 水泵2运行状态标志位 - getSb2Run().set(i, run2Bt == '1' ? true : false); + int indexRun2 = dataStr.length() - 1 - r2offset * 16 - r2bit; + if (indexRun2 >= 0) { + char run2Bt = dataStr.charAt(indexRun2); // 水泵2运行状态标志位 + getSb2Run().set(i, run2Bt == '1' ? true : false); + } } // 解析水泵1故障报警状态 @@ -210,8 +220,11 @@ int f1offset = f1kszdz - start; // 与开始字的偏移量 int f1bit = flt1BlObj.getSzw(); // 所在位 - char flt1Bt = dataStr.charAt(dataStr.length() - 1 - f1offset * 16 - f1bit); // 水泵1故障报警标志位 - getSb1Flt().set(i, flt1Bt == '1' ? true : false); + int indexFlt1 = dataStr.length() - 1 - f1offset * 16 - f1bit; + if (indexFlt1 >= 0) { + char flt1Bt = dataStr.charAt(indexFlt1); // 水泵1故障报警标志位 + getSb1Flt().set(i, flt1Bt == '1' ? true : false); + } } // 解析水泵2故障报警状态 @@ -221,8 +234,11 @@ int f2offset = f2kszdz - start; // 与开始字的偏移量 int f2bit = flt2BlObj.getSzw(); // 所在位 - char flt2Bt = dataStr.charAt(dataStr.length() - 1 - f2offset * 16 - f2bit); // 水泵1故障报警标志位 - getSb2Flt().set(i, flt2Bt == '1' ? true : false); + int indexFlt2 = dataStr.length() - 1 - f2offset * 16 - f2bit; + if (indexFlt2 >= 0) { + char flt2Bt = dataStr.charAt(indexFlt2); // 水泵1故障报警标志位 + getSb2Flt().set(i, flt2Bt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java index 819e740..e95137a 100644 --- a/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java @@ -140,11 +140,13 @@ int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 爆管液位报警状态标志位 + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 爆管液位报警状态标志位 + getYwbj().set(i, bjBt == '1' ? true : false); - getYwbj().set(i, bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段液位爆管报警" + bjBt + "]"); + logger.info("[" + zcbh + "][舱段液位爆管报警" + bjBt + "]"); + } } } diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java index 425d940..49396dc 100644 --- a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -124,6 +125,9 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + dsbj = Arrays.asList(new Boolean[zcList.length]); // 解析红外对射报警状态 for (int i = 0; i < zcList.length; i++) { @@ -138,12 +142,14 @@ int akszdz = almBlObj.getKszdz(); //开始字地址 int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 红外对射报警状态标志位 - - getDsbj().add(bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 红外对射报警状态标志位 + getDsbj().set(i, bjBt == '1' ? true : false); + + logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + } } logger.info("解析[读取舱段对射报警状态]响应指令结束"); diff --git a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java index f9b138f..30ec9da 100644 --- a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java @@ -160,8 +160,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - getFjRun().set(i, runBt == '1' ? true : false); + int indexRun = dataStr.length() - 1 - roffset * 16 - rbit; + if (indexRun >= 0) { + char runBt = dataStr.charAt(indexRun); // 风机运行状态标志位 + getFjRun().set(i, runBt == '1' ? true : false); + } } // 解析风机故障报警状态 @@ -171,8 +174,11 @@ int foffset = fkszdz - start; //与开始字的偏移量 int fbit = fltBlObj.getSzw(); //所在位 - char fltBt = dataStr.charAt(dataStr.length() - 1 - foffset * 16 - fbit); // 风机故障报警标志位 - getFjFlt().set(i, fltBt == '1' ? true : false); + int indexFlt = dataStr.length() - 1 - foffset * 16 - fbit; + if (indexFlt >= 0) { + char fltBt = dataStr.charAt(indexFlt); // 风机故障报警标志位 + getFjFlt().set(i, fltBt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java index b76ad87..2d2b5a9 100644 --- a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -132,6 +133,12 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + jgdk = Arrays.asList(new Boolean[zcList.length]); + jggb = Arrays.asList(new Boolean[zcList.length]); + jgsd = Arrays.asList(new Boolean[zcList.length]); + jgzt = Arrays.asList(new String[zcList.length]); // 解析井盖状态 for (int i = 0; i < zcList.length; i++) { @@ -151,22 +158,27 @@ int ckszdz = closeBlObj.getKszdz(); //开始字地址 int coffset = ckszdz - start; //与开始字的偏移量 int cbit = closeBlObj.getSzw(); //所在位 - - char openBt = dataStr.charAt(dataStr.length() - 1 - ooffset * 16 - obit); // 井盖开到位标志位 - char closeBt = dataStr.charAt(dataStr.length() - 1 - coffset * 16 - cbit); // 井盖关到位标志位 - - getJgdk().add(openBt == '0' ? true : false); //1-开到位，0-未开到位 - getJggb().add(closeBt == '0' ? true : false); //1-关到位，0-未关到位 - - // 判断井盖打开状态 - if (openBt == '0' && closeBt == '0') { - getJgzt().add("半开半闭"); //半开半闭 - } else if (openBt == '1' && closeBt == '0') { - getJgzt().add("全开"); //全开 - } else if (openBt == '0' && closeBt == '1') { - getJgzt().add("全关"); //全关 - } else { - getJgzt().add("数值异常"); //数值异常 + + int indexOpen = dataStr.length() - 1 - ooffset * 16 - obit; + int indexClose = dataStr.length() - 1 - coffset * 16 - cbit; + if (indexOpen >= 0 && indexClose >= 0) { + + char openBt = dataStr.charAt(indexOpen); // 井盖开到位标志位 + char closeBt = dataStr.charAt(indexClose); // 井盖关到位标志位 + + getJgdk().set(i, openBt == '0' ? true : false); //1-开到位，0-未开到位 + getJggb().set(i, closeBt == '0' ? true : false); //1-关到位，0-未关到位 + + // 判断井盖打开状态 + if (openBt == '0' && closeBt == '0') { + getJgzt().set(i, "半开半闭"); //半开半闭 + } else if (openBt == '1' && closeBt == '0') { + getJgzt().set(i, "全开"); //全开 + } else if (openBt == '0' && closeBt == '1') { + getJgzt().set(i, "全关"); //全关 + } else { + getJgzt().set(i, "数值异常"); //数值异常 + } } // 解析井盖锁定/解锁状态 @@ -178,10 +190,12 @@ int lkszdz = lockBlObj.getKszdz(); //开始字地址 int loffset = lkszdz - start; //与开始字的偏移量 int lbit = lockBlObj.getSzw(); //所在位 - - char lockBt = dataStr.charAt(dataStr.length() - 1 - loffset * 16 - lbit); // 井盖解锁/锁定标志位 - - getJgsd().add(lockBt == '0' ? true : false); //0-锁定;1-解锁 + + int indexLock = dataStr.length() - 1 - loffset * 16 - lbit; + if (indexLock >= 0) { + char lockBt = dataStr.charAt(indexLock); // 井盖解锁/锁定标志位 + getJgsd().set(i, lockBt == '0' ? true : false); //0-锁定;1-解锁 + } logger.info("[" + zcbh + "][井盖状态" + getJgzt().get(i) + "][井盖锁定" + getJgsd().get(i) + "]"); } diff --git a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java index 081f7d8..cf5c600 100644 --- a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java @@ -102,11 +102,15 @@ if (deviceId > 0) { // 根据是否有数据来判断单泵还是双泵 if (null == sb2Run.get(i)) { - logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } else { - logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } // 如果单泵或者双泵有任意一个故障则都报警 @@ -188,8 +192,11 @@ int r1offset = r1kszdz - start; // 与开始字的偏移量 int r1bit = run1BlObj.getSzw(); // 所在位 - char run1Bt = dataStr.charAt(dataStr.length() - 1 - r1offset * 16 - r1bit); // 水泵1运行状态标志位 - getSb1Run().set(i, run1Bt == '1' ? true : false); + int indexRun1 = dataStr.length() - 1 - r1offset * 16 - r1bit; + if (indexRun1 >= 0) { + char run1Bt = dataStr.charAt(indexRun1); // 水泵1运行状态标志位 + getSb1Run().set(i, run1Bt == '1' ? true : false); + } } // 解析水泵2运行状态 @@ -199,8 +206,11 @@ int r2offset = r2kszdz - start; // 与开始字的偏移量 int r2bit = run2BlObj.getSzw(); // 所在位 - char run2Bt = dataStr.charAt(dataStr.length() - 1 - r2offset * 16 - r2bit); // 水泵2运行状态标志位 - getSb2Run().set(i, run2Bt == '1' ? true : false); + int indexRun2 = dataStr.length() - 1 - r2offset * 16 - r2bit; + if (indexRun2 >= 0) { + char run2Bt = dataStr.charAt(indexRun2); // 水泵2运行状态标志位 + getSb2Run().set(i, run2Bt == '1' ? true : false); + } } // 解析水泵1故障报警状态 @@ -210,8 +220,11 @@ int f1offset = f1kszdz - start; // 与开始字的偏移量 int f1bit = flt1BlObj.getSzw(); // 所在位 - char flt1Bt = dataStr.charAt(dataStr.length() - 1 - f1offset * 16 - f1bit); // 水泵1故障报警标志位 - getSb1Flt().set(i, flt1Bt == '1' ? true : false); + int indexFlt1 = dataStr.length() - 1 - f1offset * 16 - f1bit; + if (indexFlt1 >= 0) { + char flt1Bt = dataStr.charAt(indexFlt1); // 水泵1故障报警标志位 + getSb1Flt().set(i, flt1Bt == '1' ? true : false); + } } // 解析水泵2故障报警状态 @@ -221,8 +234,11 @@ int f2offset = f2kszdz - start; // 与开始字的偏移量 int f2bit = flt2BlObj.getSzw(); // 所在位 - char flt2Bt = dataStr.charAt(dataStr.length() - 1 - f2offset * 16 - f2bit); // 水泵1故障报警标志位 - getSb2Flt().set(i, flt2Bt == '1' ? true : false); + int indexFlt2 = dataStr.length() - 1 - f2offset * 16 - f2bit; + if (indexFlt2 >= 0) { + char flt2Bt = dataStr.charAt(indexFlt2); // 水泵1故障报警标志位 + getSb2Flt().set(i, flt2Bt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java index 819e740..e95137a 100644 --- a/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java @@ -140,11 +140,13 @@ int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 爆管液位报警状态标志位 + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 爆管液位报警状态标志位 + getYwbj().set(i, bjBt == '1' ? true : false); - getYwbj().set(i, bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段液位爆管报警" + bjBt + "]"); + logger.info("[" + zcbh + "][舱段液位爆管报警" + bjBt + "]"); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java index b6a027f..67829eb 100644 --- a/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java @@ -113,9 +113,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - - getZmRun().set(i, runBt == '1' ? true : false); + int index = dataStr.length() - 1 - roffset * 16 - rbit; + if (index >= 0) { + char runBt = dataStr.charAt(index); // 照明运行状态标志位 + getZmRun().set(i, runBt == '1' ? true : false); + } } } } diff --git a/src/com/szpg/plc/message/command/ReadMemoryCommand.java b/src/com/szpg/plc/message/command/ReadMemoryCommand.java index b931747..fee7d38 100644 --- a/src/com/szpg/plc/message/command/ReadMemoryCommand.java +++ b/src/com/szpg/plc/message/command/ReadMemoryCommand.java @@ -43,29 +43,19 @@ switch (type) { case AppMessageConstants.CMD_TYPE_READCH4VALUE: return new ReadCH4ValueCommand(); - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - return new ReadCH4StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READWSVALUE: return new ReadWSValueCommand(); - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - return new ReadWSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READCOVALUE: return new ReadCOValueCommand(); - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - return new ReadCOStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READO2VALUE: return new ReadO2ValueCommand(); - case AppMessageConstants.CMD_TYPE_READO2STATUS: - return new ReadO2StatusCommand(); - + case AppMessageConstants.CMD_TYPE_READHSVALUE: return new ReadHSValueCommand(); - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - return new ReadHSStatusCommand(); - + case AppMessageConstants.CMD_TYPE_READYWSTATUS: return new ReadYWStatusCommand(); @@ -77,19 +67,13 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: return new ReadFjStatCommand(); - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - return new ReadFjRtCommand(); - + case AppMessageConstants.CMD_TYPE_READSBSTAT: return new ReadSbStatCommand(); - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - return new ReadSbRtCommand(); - + case AppMessageConstants.CMD_TYPE_READZMSTAT: return new ReadZmStatCommand(); - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - return new ReadZmRtCommand(); - + case AppMessageConstants.CMD_TYPE_READWSYQVALUE: return new ReadWSYQValueCommand(); diff --git a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java deleted file mode 100644 index f4e033b..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCH4StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCH4StatusCommandResponse; - -public class ReadCH4StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 6508070196810920169L; - - @Override - public Class getResponseClass() { - return ReadCH4StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询甲烷报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCH4STATUS; - } - -} \ No newline at end of file diff --git a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java deleted file mode 100644 index 757074e..0000000 --- a/src/com/szpg/plc/message/command/read/ReadCOStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadCOStatusCommandResponse; - -public class ReadCOStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 1832337387328363476L; - - @Override - public Class getResponseClass() { - return ReadCOStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询一氧化碳报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READCOSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java b/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java deleted file mode 100644 index 88f7016..0000000 --- a/src/com/szpg/plc/message/command/read/ReadFjRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadFjRtCommandResponse; - -public class ReadFjRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8726665168808135207L; - - @Override - public Class getResponseClass() { - return ReadFjRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询风机累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READFJRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java deleted file mode 100644 index e1b7536..0000000 --- a/src/com/szpg/plc/message/command/read/ReadHSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadHSStatusCommandResponse; - -public class ReadHSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8621697814661716115L; - - @Override - public Class getResponseClass() { - return ReadHSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询硫化氢报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READHSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java b/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java deleted file mode 100644 index d015f28..0000000 --- a/src/com/szpg/plc/message/command/read/ReadO2StatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadO2StatusCommandResponse; - -public class ReadO2StatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -8234355798275813455L; - - @Override - public Class getResponseClass() { - return ReadO2StatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询氧气报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READO2STATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java b/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java deleted file mode 100644 index 3f6fc81..0000000 --- a/src/com/szpg/plc/message/command/read/ReadSbRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadSbRtCommandResponse; - -public class ReadSbRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -6264729752332327429L; - - @Override - public Class getResponseClass() { - return ReadSbRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询水泵累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READSBRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java b/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java deleted file mode 100644 index 2f114d6..0000000 --- a/src/com/szpg/plc/message/command/read/ReadWSStatusCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadWSStatusCommandResponse; - -public class ReadWSStatusCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = 7832108805685215529L; - - @Override - public Class getResponseClass() { - return ReadWSStatusCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询温湿度报警状态命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READWSSTATUS; - } - -} diff --git a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java b/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java deleted file mode 100644 index 3f2dd3d..0000000 --- a/src/com/szpg/plc/message/command/read/ReadZmRtCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.szpg.plc.message.command.read; - -import com.szpg.plc.message.AppMessageConstants; -import com.szpg.plc.message.command.ReadMemoryCommand; -import com.szpg.plc.message.response.read.ReadZmRtCommandResponse; - -public class ReadZmRtCommand extends ReadMemoryCommand { - - /** - * - */ - private static final long serialVersionUID = -4085626108733700995L; - - @Override - public Class getResponseClass() { - return ReadZmRtCommandResponse.class; - } - - @Override - public String toString() { - return "向终端[" + getDestinationId() + "]发送查询照明累计运行时长命令"; - } - - @Override - public String getCommandType() { - return AppMessageConstants.CMD_TYPE_READZMRUNTIME; - } - -} diff --git a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java index 425d940..49396dc 100644 --- a/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadDSStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -124,6 +125,9 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + dsbj = Arrays.asList(new Boolean[zcList.length]); // 解析红外对射报警状态 for (int i = 0; i < zcList.length; i++) { @@ -138,12 +142,14 @@ int akszdz = almBlObj.getKszdz(); //开始字地址 int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 红外对射报警状态标志位 - - getDsbj().add(bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 红外对射报警状态标志位 + getDsbj().set(i, bjBt == '1' ? true : false); + + logger.info("[" + zcbh + "][舱段对射报警" + bjBt + "]"); + } } logger.info("解析[读取舱段对射报警状态]响应指令结束"); diff --git a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java index f9b138f..30ec9da 100644 --- a/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadFjStatCommandResponse.java @@ -160,8 +160,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - getFjRun().set(i, runBt == '1' ? true : false); + int indexRun = dataStr.length() - 1 - roffset * 16 - rbit; + if (indexRun >= 0) { + char runBt = dataStr.charAt(indexRun); // 风机运行状态标志位 + getFjRun().set(i, runBt == '1' ? true : false); + } } // 解析风机故障报警状态 @@ -171,8 +174,11 @@ int foffset = fkszdz - start; //与开始字的偏移量 int fbit = fltBlObj.getSzw(); //所在位 - char fltBt = dataStr.charAt(dataStr.length() - 1 - foffset * 16 - fbit); // 风机故障报警标志位 - getFjFlt().set(i, fltBt == '1' ? true : false); + int indexFlt = dataStr.length() - 1 - foffset * 16 - fbit; + if (indexFlt >= 0) { + char fltBt = dataStr.charAt(indexFlt); // 风机故障报警标志位 + getFjFlt().set(i, fltBt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java index b76ad87..2d2b5a9 100644 --- a/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadJgStatusCommandResponse.java @@ -1,6 +1,7 @@ package com.szpg.plc.message.response.read; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -132,6 +133,12 @@ return; } zcList = zcListStr.split(";"); + + // 初始化结果集合 + jgdk = Arrays.asList(new Boolean[zcList.length]); + jggb = Arrays.asList(new Boolean[zcList.length]); + jgsd = Arrays.asList(new Boolean[zcList.length]); + jgzt = Arrays.asList(new String[zcList.length]); // 解析井盖状态 for (int i = 0; i < zcList.length; i++) { @@ -151,22 +158,27 @@ int ckszdz = closeBlObj.getKszdz(); //开始字地址 int coffset = ckszdz - start; //与开始字的偏移量 int cbit = closeBlObj.getSzw(); //所在位 - - char openBt = dataStr.charAt(dataStr.length() - 1 - ooffset * 16 - obit); // 井盖开到位标志位 - char closeBt = dataStr.charAt(dataStr.length() - 1 - coffset * 16 - cbit); // 井盖关到位标志位 - - getJgdk().add(openBt == '0' ? true : false); //1-开到位，0-未开到位 - getJggb().add(closeBt == '0' ? true : false); //1-关到位，0-未关到位 - - // 判断井盖打开状态 - if (openBt == '0' && closeBt == '0') { - getJgzt().add("半开半闭"); //半开半闭 - } else if (openBt == '1' && closeBt == '0') { - getJgzt().add("全开"); //全开 - } else if (openBt == '0' && closeBt == '1') { - getJgzt().add("全关"); //全关 - } else { - getJgzt().add("数值异常"); //数值异常 + + int indexOpen = dataStr.length() - 1 - ooffset * 16 - obit; + int indexClose = dataStr.length() - 1 - coffset * 16 - cbit; + if (indexOpen >= 0 && indexClose >= 0) { + + char openBt = dataStr.charAt(indexOpen); // 井盖开到位标志位 + char closeBt = dataStr.charAt(indexClose); // 井盖关到位标志位 + + getJgdk().set(i, openBt == '0' ? true : false); //1-开到位，0-未开到位 + getJggb().set(i, closeBt == '0' ? true : false); //1-关到位，0-未关到位 + + // 判断井盖打开状态 + if (openBt == '0' && closeBt == '0') { + getJgzt().set(i, "半开半闭"); //半开半闭 + } else if (openBt == '1' && closeBt == '0') { + getJgzt().set(i, "全开"); //全开 + } else if (openBt == '0' && closeBt == '1') { + getJgzt().set(i, "全关"); //全关 + } else { + getJgzt().set(i, "数值异常"); //数值异常 + } } // 解析井盖锁定/解锁状态 @@ -178,10 +190,12 @@ int lkszdz = lockBlObj.getKszdz(); //开始字地址 int loffset = lkszdz - start; //与开始字的偏移量 int lbit = lockBlObj.getSzw(); //所在位 - - char lockBt = dataStr.charAt(dataStr.length() - 1 - loffset * 16 - lbit); // 井盖解锁/锁定标志位 - - getJgsd().add(lockBt == '0' ? true : false); //0-锁定;1-解锁 + + int indexLock = dataStr.length() - 1 - loffset * 16 - lbit; + if (indexLock >= 0) { + char lockBt = dataStr.charAt(indexLock); // 井盖解锁/锁定标志位 + getJgsd().set(i, lockBt == '0' ? true : false); //0-锁定;1-解锁 + } logger.info("[" + zcbh + "][井盖状态" + getJgzt().get(i) + "][井盖锁定" + getJgsd().get(i) + "]"); } diff --git a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java index 081f7d8..cf5c600 100644 --- a/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadSbStatCommandResponse.java @@ -102,11 +102,15 @@ if (deviceId > 0) { // 根据是否有数据来判断单泵还是双泵 if (null == sb2Run.get(i)) { - logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态" + sb1Run.get(i) + "][故障报警" + sb1Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } else { - logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); - deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + if (null != sb1Run.get(i)) { + logger.info("水泵[" + zcbh + "][运行状态1" + sb1Run.get(i) + "][故障报警1" + sb1Flt.get(i) + "][运行状态2" + sb2Run.get(i) + "][故障报警2" + sb2Flt.get(i) + "]"); + deviceDao.updateDeviceStatus(deviceId, sb1Run.get(i) | sb2Run.get(i) == true ? "水泵运行" : "水泵停止"); + } } // 如果单泵或者双泵有任意一个故障则都报警 @@ -188,8 +192,11 @@ int r1offset = r1kszdz - start; // 与开始字的偏移量 int r1bit = run1BlObj.getSzw(); // 所在位 - char run1Bt = dataStr.charAt(dataStr.length() - 1 - r1offset * 16 - r1bit); // 水泵1运行状态标志位 - getSb1Run().set(i, run1Bt == '1' ? true : false); + int indexRun1 = dataStr.length() - 1 - r1offset * 16 - r1bit; + if (indexRun1 >= 0) { + char run1Bt = dataStr.charAt(indexRun1); // 水泵1运行状态标志位 + getSb1Run().set(i, run1Bt == '1' ? true : false); + } } // 解析水泵2运行状态 @@ -199,8 +206,11 @@ int r2offset = r2kszdz - start; // 与开始字的偏移量 int r2bit = run2BlObj.getSzw(); // 所在位 - char run2Bt = dataStr.charAt(dataStr.length() - 1 - r2offset * 16 - r2bit); // 水泵2运行状态标志位 - getSb2Run().set(i, run2Bt == '1' ? true : false); + int indexRun2 = dataStr.length() - 1 - r2offset * 16 - r2bit; + if (indexRun2 >= 0) { + char run2Bt = dataStr.charAt(indexRun2); // 水泵2运行状态标志位 + getSb2Run().set(i, run2Bt == '1' ? true : false); + } } // 解析水泵1故障报警状态 @@ -210,8 +220,11 @@ int f1offset = f1kszdz - start; // 与开始字的偏移量 int f1bit = flt1BlObj.getSzw(); // 所在位 - char flt1Bt = dataStr.charAt(dataStr.length() - 1 - f1offset * 16 - f1bit); // 水泵1故障报警标志位 - getSb1Flt().set(i, flt1Bt == '1' ? true : false); + int indexFlt1 = dataStr.length() - 1 - f1offset * 16 - f1bit; + if (indexFlt1 >= 0) { + char flt1Bt = dataStr.charAt(indexFlt1); // 水泵1故障报警标志位 + getSb1Flt().set(i, flt1Bt == '1' ? true : false); + } } // 解析水泵2故障报警状态 @@ -221,8 +234,11 @@ int f2offset = f2kszdz - start; // 与开始字的偏移量 int f2bit = flt2BlObj.getSzw(); // 所在位 - char flt2Bt = dataStr.charAt(dataStr.length() - 1 - f2offset * 16 - f2bit); // 水泵1故障报警标志位 - getSb2Flt().set(i, flt2Bt == '1' ? true : false); + int indexFlt2 = dataStr.length() - 1 - f2offset * 16 - f2bit; + if (indexFlt2 >= 0) { + char flt2Bt = dataStr.charAt(indexFlt2); // 水泵1故障报警标志位 + getSb2Flt().set(i, flt2Bt == '1' ? true : false); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java index 819e740..e95137a 100644 --- a/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadYWStatusCommandResponse.java @@ -140,11 +140,13 @@ int aoffset = akszdz - start; //与开始字的偏移量 int abit = almBlObj.getSzw(); //所在位 - char bjBt = dataStr.charAt(dataStr.length() - 1 - aoffset * 16 - abit); // 爆管液位报警状态标志位 + int index = dataStr.length() - 1 - aoffset * 16 - abit; + if (index >= 0) { + char bjBt = dataStr.charAt(index); // 爆管液位报警状态标志位 + getYwbj().set(i, bjBt == '1' ? true : false); - getYwbj().set(i, bjBt == '1' ? true : false); - - logger.info("[" + zcbh + "][舱段液位爆管报警" + bjBt + "]"); + logger.info("[" + zcbh + "][舱段液位爆管报警" + bjBt + "]"); + } } } diff --git a/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java index b6a027f..67829eb 100644 --- a/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadZmStatCommandResponse.java @@ -113,9 +113,11 @@ int roffset = rkszdz - start; //与开始字的偏移量 int rbit = runBlObj.getSzw(); //所在位 - char runBt = dataStr.charAt(dataStr.length() - 1 - roffset * 16 - rbit); // 风机运行状态标志位 - - getZmRun().set(i, runBt == '1' ? true : false); + int index = dataStr.length() - 1 - roffset * 16 - rbit; + if (index >= 0) { + char runBt = dataStr.charAt(index); // 照明运行状态标志位 + getZmRun().set(i, runBt == '1' ? true : false); + } } } } diff --git a/src/com/szpg/plc/protocol/fins/FINSDTProtocolImp.java b/src/com/szpg/plc/protocol/fins/FINSDTProtocolImp.java index ddeb866..0a27e19 100644 --- a/src/com/szpg/plc/protocol/fins/FINSDTProtocolImp.java +++ b/src/com/szpg/plc/protocol/fins/FINSDTProtocolImp.java @@ -110,37 +110,22 @@ case AppMessageConstants.CMD_TYPE_READCH4VALUE: received = bytesToReadCH4ValueCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READCH4STATUS: - received = bytesToReadCH4StatusCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READWSVALUE: received = bytesToReadWSValueCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READWSSTATUS: - received = bytesToReadWSStatusCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READCOVALUE: received = bytesToReadCOValueCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READCOSTATUS: - received = bytesToReadCOStatusCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READO2VALUE: received = bytesToReadO2ValueCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READO2STATUS: - received = bytesToReadO2StatusCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READHSVALUE: received = bytesToReadHSValueCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READHSSTATUS: - received = bytesToReadHSStatusCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READYWSTATUS: received = bytesToReadYWStatusCommandResponse(finsFrame); @@ -153,23 +138,14 @@ case AppMessageConstants.CMD_TYPE_READFJSTAT: received = bytesToReadFjStatCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READFJRUNTIME: - received = bytesToReadFjRtCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READSBSTAT: received = bytesToReadSbStatCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READSBRUNTIME: - received = bytesToReadSbRtCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READZMSTAT: received = bytesToReadZmStatCommandResponse(finsFrame); break; - case AppMessageConstants.CMD_TYPE_READZMRUNTIME: - received = bytesToReadZmRtCommandResponse(finsFrame); - break; case AppMessageConstants.CMD_TYPE_READJGSTATUS: received = bytesToReadJgStatusCommandResponse(finsFrame); @@ -264,30 +240,7 @@ return rcvcr; } - - - /** - * 将查询甲烷报警状态响应消息字节数组转换为消息对象 - * - * @param finsFrame - * @return - */ - private AppMessage bytesToReadCH4StatusCommandResponse(FINSByteFrame finsFrame) { - ReadCH4StatusCommandResponse rcscr = new ReadCH4StatusCommandResponse(); - rcscr.setCommandType(AppMessageConstants.CMD_TYPE_READCH4STATUS); - - byte[] body = finsFrame.TEXT_DATA_BODY; - rcscr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - rcscr.setResponseData(data); - } else { - rcscr.setValid(false); - } - - return rcscr; - } + /** * 将读取温湿度监测值响应字节数组转换为消息对象 @@ -309,23 +262,7 @@ return rwvcr; } - - - private AppMessage bytesToReadWSStatusCommandResponse(FINSByteFrame finsFrame) { - ReadWSStatusCommandResponse rwsscr = new ReadWSStatusCommandResponse(); - rwsscr.setCommandType(AppMessageConstants.CMD_TYPE_READWSSTATUS); - - byte[] body = finsFrame.TEXT_DATA_BODY; - rwsscr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - rwsscr.setResponseData(data); - } - - return rwsscr; - } - + /** * 将查询一氧化碳参数响应消息字节数组转换为消息对象 @@ -350,28 +287,6 @@ /** - * 将查询一氧化碳报警状态响应消息字节数组转换为消息对象 - * - * @param finsFrame - * @return - */ - private AppMessage bytesToReadCOStatusCommandResponse(FINSByteFrame finsFrame) { - ReadCOStatusCommandResponse rcscr = new ReadCOStatusCommandResponse(); - rcscr.setCommandType(AppMessageConstants.CMD_TYPE_READCOSTATUS); - - byte[] body = finsFrame.TEXT_DATA_BODY; - rcscr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - rcscr.setResponseData(data); - } - - return rcscr; - } - - - /** * 将查询氧气参数响应消息字节数组转换为消息对象 * * @param finsFrame @@ -391,28 +306,6 @@ return rovcr; } - - - /** - * 将查询氧气报警状态响应消息字节数组转换为消息对象 - * - * @param finsFrame - * @return - */ - private AppMessage bytesToReadO2StatusCommandResponse(FINSByteFrame finsFrame) { - ReadO2StatusCommandResponse roscr = new ReadO2StatusCommandResponse(); - roscr.setCommandType(AppMessageConstants.CMD_TYPE_READO2STATUS); - - byte[] body = finsFrame.TEXT_DATA_BODY; - roscr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - roscr.setResponseData(data); - } - - return roscr; - } /** @@ -435,28 +328,7 @@ return rhvcr; } - - - /** - * 将查询硫化氢报警状态响应消息字节数组转换为消息对象 - * - * @param finsFrame - * @return - */ - private AppMessage bytesToReadHSStatusCommandResponse(FINSByteFrame finsFrame) { - ReadHSStatusCommandResponse rhscr = new ReadHSStatusCommandResponse(); - rhscr.setCommandType(AppMessageConstants.CMD_TYPE_READHSSTATUS); - - byte[] body = finsFrame.TEXT_DATA_BODY; - rhscr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - rhscr.setResponseData(data); - } - - return rhscr; - } + /** * 将查询爆管液位报警状态响应消息字节数组转换为消息对象 @@ -524,28 +396,6 @@ /** - * 将读取风机运行时长响应字节数组转换为消息对象 - * - * @param finsFrame - * @return - */ - private AppMessage bytesToReadFjRtCommandResponse(FINSByteFrame finsFrame) { - ReadFjRtCommandResponse rfrcr = new ReadFjRtCommandResponse(); - rfrcr.setCommandType(AppMessageConstants.CMD_TYPE_READFJRUNTIME); - - byte[] body = finsFrame.TEXT_DATA_BODY; - rfrcr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - rfrcr.setResponseData(data); - } - - return rfrcr; - } - - - /** * 将查询水泵运行状态响应消息字节数组转换为消息对象 * * @param finsFrame @@ -568,28 +418,6 @@ /** - * 将读取水泵运行时长响应字节数组转换为消息对象 - * - * @param finsFrame - * @return - */ - private AppMessage bytesToReadSbRtCommandResponse(FINSByteFrame finsFrame) { - ReadSbRtCommandResponse rsrcr = new ReadSbRtCommandResponse(); - rsrcr.setCommandType(AppMessageConstants.CMD_TYPE_READSBRUNTIME); - - byte[] body = finsFrame.TEXT_DATA_BODY; - rsrcr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - rsrcr.setResponseData(data); - } - - return rsrcr; - } - - - /** * 将查询照明运行状态响应消息字节数组转换为消息对象 * * @param finsFrame @@ -612,28 +440,6 @@ /** - * 将读取照明运行时长响应字节数组转换为消息对象 - * - * @param finsFrame - * @return - */ - private AppMessage bytesToReadZmRtCommandResponse(FINSByteFrame finsFrame) { - ReadZmRtCommandResponse rsrcr = new ReadZmRtCommandResponse(); - rsrcr.setCommandType(AppMessageConstants.CMD_TYPE_READZMRUNTIME); - - byte[] body = finsFrame.TEXT_DATA_BODY; - rsrcr.setMessageProducerId(FINSByteFrameTool.getControlDest(finsFrame)); - if (body[2] == 0x00 && body[3] == 0x00) { - // 正常返回 - byte[] data = FINSByteFrameTool.getDataWithoutEndCode(finsFrame); //获取返回的内存 - rsrcr.setResponseData(data); - } - - return rsrcr; - } - - - /** * 将查询井盖状态响应消息字节数组转换为消息对象 * * @param finsFrame