diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadZmStatTask.java b/src/com/szpg/task/ReadZmStatTask.java index c81c1eb..b83b959 100644 --- a/src/com/szpg/task/ReadZmStatTask.java +++ b/src/com/szpg/task/ReadZmStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadZmStatTask.java b/src/com/szpg/task/ReadZmStatTask.java index c81c1eb..b83b959 100644 --- a/src/com/szpg/task/ReadZmStatTask.java +++ b/src/com/szpg/task/ReadZmStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/SetCH4ThresholdTask.java b/src/com/szpg/task/SetCH4ThresholdTask.java index cdf6151..b761ec5 100644 --- a/src/com/szpg/task/SetCH4ThresholdTask.java +++ b/src/com/szpg/task/SetCH4ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadZmStatTask.java b/src/com/szpg/task/ReadZmStatTask.java index c81c1eb..b83b959 100644 --- a/src/com/szpg/task/ReadZmStatTask.java +++ b/src/com/szpg/task/ReadZmStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/SetCH4ThresholdTask.java b/src/com/szpg/task/SetCH4ThresholdTask.java index cdf6151..b761ec5 100644 --- a/src/com/szpg/task/SetCH4ThresholdTask.java +++ b/src/com/szpg/task/SetCH4ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetCOThresholdTask.java b/src/com/szpg/task/SetCOThresholdTask.java index c033b15..066eaf7 100644 --- a/src/com/szpg/task/SetCOThresholdTask.java +++ b/src/com/szpg/task/SetCOThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadZmStatTask.java b/src/com/szpg/task/ReadZmStatTask.java index c81c1eb..b83b959 100644 --- a/src/com/szpg/task/ReadZmStatTask.java +++ b/src/com/szpg/task/ReadZmStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/SetCH4ThresholdTask.java b/src/com/szpg/task/SetCH4ThresholdTask.java index cdf6151..b761ec5 100644 --- a/src/com/szpg/task/SetCH4ThresholdTask.java +++ b/src/com/szpg/task/SetCH4ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetCOThresholdTask.java b/src/com/szpg/task/SetCOThresholdTask.java index c033b15..066eaf7 100644 --- a/src/com/szpg/task/SetCOThresholdTask.java +++ b/src/com/szpg/task/SetCOThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetHSThresholdTask.java b/src/com/szpg/task/SetHSThresholdTask.java index 63e6a7f..5576d21 100644 --- a/src/com/szpg/task/SetHSThresholdTask.java +++ b/src/com/szpg/task/SetHSThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadZmStatTask.java b/src/com/szpg/task/ReadZmStatTask.java index c81c1eb..b83b959 100644 --- a/src/com/szpg/task/ReadZmStatTask.java +++ b/src/com/szpg/task/ReadZmStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/SetCH4ThresholdTask.java b/src/com/szpg/task/SetCH4ThresholdTask.java index cdf6151..b761ec5 100644 --- a/src/com/szpg/task/SetCH4ThresholdTask.java +++ b/src/com/szpg/task/SetCH4ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetCOThresholdTask.java b/src/com/szpg/task/SetCOThresholdTask.java index c033b15..066eaf7 100644 --- a/src/com/szpg/task/SetCOThresholdTask.java +++ b/src/com/szpg/task/SetCOThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetHSThresholdTask.java b/src/com/szpg/task/SetHSThresholdTask.java index 63e6a7f..5576d21 100644 --- a/src/com/szpg/task/SetHSThresholdTask.java +++ b/src/com/szpg/task/SetHSThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetJgUnlockTask.java b/src/com/szpg/task/SetJgUnlockTask.java index f97a579..b70c44d 100644 --- a/src/com/szpg/task/SetJgUnlockTask.java +++ b/src/com/szpg/task/SetJgUnlockTask.java @@ -68,6 +68,7 @@ PgHjsbbl onBlObj = blDao.findBlByBh(deviceCode + ".Lock"); if (null != onBlObj) { setUnlockCmd.setMessageProducerId(sour); + setUnlockCmd.setMessageProducerHost(client.getHost()); setUnlockCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadZmStatTask.java b/src/com/szpg/task/ReadZmStatTask.java index c81c1eb..b83b959 100644 --- a/src/com/szpg/task/ReadZmStatTask.java +++ b/src/com/szpg/task/ReadZmStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/SetCH4ThresholdTask.java b/src/com/szpg/task/SetCH4ThresholdTask.java index cdf6151..b761ec5 100644 --- a/src/com/szpg/task/SetCH4ThresholdTask.java +++ b/src/com/szpg/task/SetCH4ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetCOThresholdTask.java b/src/com/szpg/task/SetCOThresholdTask.java index c033b15..066eaf7 100644 --- a/src/com/szpg/task/SetCOThresholdTask.java +++ b/src/com/szpg/task/SetCOThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetHSThresholdTask.java b/src/com/szpg/task/SetHSThresholdTask.java index 63e6a7f..5576d21 100644 --- a/src/com/szpg/task/SetHSThresholdTask.java +++ b/src/com/szpg/task/SetHSThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetJgUnlockTask.java b/src/com/szpg/task/SetJgUnlockTask.java index f97a579..b70c44d 100644 --- a/src/com/szpg/task/SetJgUnlockTask.java +++ b/src/com/szpg/task/SetJgUnlockTask.java @@ -68,6 +68,7 @@ PgHjsbbl onBlObj = blDao.findBlByBh(deviceCode + ".Lock"); if (null != onBlObj) { setUnlockCmd.setMessageProducerId(sour); + setUnlockCmd.setMessageProducerHost(client.getHost()); setUnlockCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetO2ThresholdTask.java b/src/com/szpg/task/SetO2ThresholdTask.java index 7a09ded..2ef4b1d 100644 --- a/src/com/szpg/task/SetO2ThresholdTask.java +++ b/src/com/szpg/task/SetO2ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/ReadCH4ValueTask.java b/src/com/szpg/task/ReadCH4ValueTask.java index 4fd4e42..3d8385e 100644 --- a/src/com/szpg/task/ReadCH4ValueTask.java +++ b/src/com/szpg/task/ReadCH4ValueTask.java @@ -33,13 +33,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCH4VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadCOValueTask.java b/src/com/szpg/task/ReadCOValueTask.java index 18e833e..48b2093 100644 --- a/src/com/szpg/task/ReadCOValueTask.java +++ b/src/com/szpg/task/ReadCOValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READCOVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadDSStatusTask.java b/src/com/szpg/task/ReadDSStatusTask.java index 5951391..859bf33 100644 --- a/src/com/szpg/task/ReadDSStatusTask.java +++ b/src/com/szpg/task/ReadDSStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadFjStatTask.java b/src/com/szpg/task/ReadFjStatTask.java index bd0f5c5..4844e94 100644 --- a/src/com/szpg/task/ReadFjStatTask.java +++ b/src/com/szpg/task/ReadFjStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadHSValueTask.java b/src/com/szpg/task/ReadHSValueTask.java index fbd24d4..59643cd 100644 --- a/src/com/szpg/task/ReadHSValueTask.java +++ b/src/com/szpg/task/ReadHSValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READHSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadJgStatusTask.java b/src/com/szpg/task/ReadJgStatusTask.java index d86f95b..b6e5ce9 100644 --- a/src/com/szpg/task/ReadJgStatusTask.java +++ b/src/com/szpg/task/ReadJgStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadO2ValueTask.java b/src/com/szpg/task/ReadO2ValueTask.java index 4cff387..6f3f9ac 100644 --- a/src/com/szpg/task/ReadO2ValueTask.java +++ b/src/com/szpg/task/ReadO2ValueTask.java @@ -28,12 +28,13 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READO2VALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadSbStatTask.java b/src/com/szpg/task/ReadSbStatTask.java index 1ca23f4..2e21aec 100644 --- a/src/com/szpg/task/ReadSbStatTask.java +++ b/src/com/szpg/task/ReadSbStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadWSValueTask.java b/src/com/szpg/task/ReadWSValueTask.java index 28fc37d..3675f47 100644 --- a/src/com/szpg/task/ReadWSValueTask.java +++ b/src/com/szpg/task/ReadWSValueTask.java @@ -27,13 +27,14 @@ Map clients = ACUClientUtil.getInstance().getClients(); for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag() == "11") { + if (client.getFlag().equals("11")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadWSYQValueTask.java b/src/com/szpg/task/ReadWSYQValueTask.java index 1e3fabd..e537edc 100644 --- a/src/com/szpg/task/ReadWSYQValueTask.java +++ b/src/com/szpg/task/ReadWSYQValueTask.java @@ -34,13 +34,14 @@ for (String key : clients.keySet()) { ACUClient client = clients.get(key); - if (client.getFlag().equals("23")) { + if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 构建命令对象 ReadMemoryCommand command = ReadMemoryCommand.getInstance(AppMessageConstants.CMD_TYPE_READWSYQVALUE); String sour = Configure.getProperty("sys", "LOCALHOST.NET") + Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); diff --git a/src/com/szpg/task/ReadYWStatusTask.java b/src/com/szpg/task/ReadYWStatusTask.java index e142f51..74f9a16 100644 --- a/src/com/szpg/task/ReadYWStatusTask.java +++ b/src/com/szpg/task/ReadYWStatusTask.java @@ -33,6 +33,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/ReadZmStatTask.java b/src/com/szpg/task/ReadZmStatTask.java index c81c1eb..b83b959 100644 --- a/src/com/szpg/task/ReadZmStatTask.java +++ b/src/com/szpg/task/ReadZmStatTask.java @@ -32,6 +32,7 @@ Configure.getProperty("sys", "LOCALHOST.NODE") + Configure.getProperty("sys", "LOCALHOST.UNIT"); command.setMessageProducerId(sour); + command.setMessageProducerHost(client.getHost()); String dest = client.getNet() + client.getNode() + client.getUnit(); command.setDestinationId(dest); diff --git a/src/com/szpg/task/SetCH4ThresholdTask.java b/src/com/szpg/task/SetCH4ThresholdTask.java index cdf6151..b761ec5 100644 --- a/src/com/szpg/task/SetCH4ThresholdTask.java +++ b/src/com/szpg/task/SetCH4ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetCOThresholdTask.java b/src/com/szpg/task/SetCOThresholdTask.java index c033b15..066eaf7 100644 --- a/src/com/szpg/task/SetCOThresholdTask.java +++ b/src/com/szpg/task/SetCOThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetHSThresholdTask.java b/src/com/szpg/task/SetHSThresholdTask.java index 63e6a7f..5576d21 100644 --- a/src/com/szpg/task/SetHSThresholdTask.java +++ b/src/com/szpg/task/SetHSThresholdTask.java @@ -89,6 +89,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetJgUnlockTask.java b/src/com/szpg/task/SetJgUnlockTask.java index f97a579..b70c44d 100644 --- a/src/com/szpg/task/SetJgUnlockTask.java +++ b/src/com/szpg/task/SetJgUnlockTask.java @@ -68,6 +68,7 @@ PgHjsbbl onBlObj = blDao.findBlByBh(deviceCode + ".Lock"); if (null != onBlObj) { setUnlockCmd.setMessageProducerId(sour); + setUnlockCmd.setMessageProducerHost(client.getHost()); setUnlockCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetO2ThresholdTask.java b/src/com/szpg/task/SetO2ThresholdTask.java index 7a09ded..2ef4b1d 100644 --- a/src/com/szpg/task/SetO2ThresholdTask.java +++ b/src/com/szpg/task/SetO2ThresholdTask.java @@ -88,6 +88,7 @@ PgHjsbbl tBlObj = blDao.findBlByBh(deviceCode + ".Set"); if (null != tBlObj) { setThreCmd.setMessageProducerId(sour); + setThreCmd.setMessageProducerHost(client.getHost()); setThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成 diff --git a/src/com/szpg/task/SetWSThresholdTask.java b/src/com/szpg/task/SetWSThresholdTask.java index cd6aba2..f4bb582 100644 --- a/src/com/szpg/task/SetWSThresholdTask.java +++ b/src/com/szpg/task/SetWSThresholdTask.java @@ -94,6 +94,7 @@ PgHjsbbl temBlObj = blDao.findBlByBh(deviceCode + ".TemSet"); if (null != temBlObj) { setTemThreCmd.setMessageProducerId(sour); + setTemThreCmd.setMessageProducerHost(client.getHost()); setTemThreCmd.setDestinationId(dest); // SID在new对象的时候已经生成