diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 40caa2f..f2d87b5 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -1360,13 +1360,13 @@ #\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF -THXC.ACU011.DS.COUNT = 6 +THXC.ACU011.DS.COUNT = 4 #\u65E0\u7EBF\u5BF9\u5C04\u8BBE\u5907\u7F16\u7801\u5217\u8868 -THXC.ACU011.DS.ZC.LIST = THXC.ACU011.J.RIR01;THXC.ACU011.J.RIR02;THXC.ACU011.J.RIR03;THXC.ACU011.J.SIR01;THXC.ACU011.J.SIR02;THXC.ACU011.J.SIR03 +THXC.ACU011.DS.ZC.LIST = THXC.ACU011.J.RIR01;THXC.ACU011.J.RIR02;THXC.ACU011.J.SIR01;THXC.ACU011.J.SIR02 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u8D77\u59CB\u5730\u5740 THXC.ACU011.DSALM.START = 38 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u6240\u5360\u5B57\u6570 -THXC.ACU011.DSALM.WORDCOUNT = 2 +THXC.ACU011.DSALM.WORDCOUNT = 1 #\u98CE\u673A\u6570\u91CF @@ -1930,13 +1930,13 @@ #\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF -THXC.ACU016.DS.COUNT = 6 +THXC.ACU016.DS.COUNT = 4 #\u65E0\u7EBF\u5BF9\u5C04\u8BBE\u5907\u7F16\u7801\u5217\u8868 -THXC.ACU016.DS.ZC.LIST = THXC.ACU016.J.RIR01;THXC.ACU016.J.RIR02;THXC.ACU016.J.RIR03;THXC.ACU016.J.SIR01;THXC.ACU016.J.SIR02;THXC.ACU016.J.SIR03 +THXC.ACU016.DS.ZC.LIST = THXC.ACU016.J.RIR01;THXC.ACU016.J.RIR02;THXC.ACU016.J.SIR01;THXC.ACU016.J.SIR02 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u8D77\u59CB\u5730\u5740 THXC.ACU016.DSALM.START = 38 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u6240\u5360\u5B57\u6570 -THXC.ACU016.DSALM.WORDCOUNT = 2 +THXC.ACU016.DSALM.WORDCOUNT = 1 #\u98CE\u673A\u6570\u91CF diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 40caa2f..f2d87b5 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -1360,13 +1360,13 @@ #\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF -THXC.ACU011.DS.COUNT = 6 +THXC.ACU011.DS.COUNT = 4 #\u65E0\u7EBF\u5BF9\u5C04\u8BBE\u5907\u7F16\u7801\u5217\u8868 -THXC.ACU011.DS.ZC.LIST = THXC.ACU011.J.RIR01;THXC.ACU011.J.RIR02;THXC.ACU011.J.RIR03;THXC.ACU011.J.SIR01;THXC.ACU011.J.SIR02;THXC.ACU011.J.SIR03 +THXC.ACU011.DS.ZC.LIST = THXC.ACU011.J.RIR01;THXC.ACU011.J.RIR02;THXC.ACU011.J.SIR01;THXC.ACU011.J.SIR02 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u8D77\u59CB\u5730\u5740 THXC.ACU011.DSALM.START = 38 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u6240\u5360\u5B57\u6570 -THXC.ACU011.DSALM.WORDCOUNT = 2 +THXC.ACU011.DSALM.WORDCOUNT = 1 #\u98CE\u673A\u6570\u91CF @@ -1930,13 +1930,13 @@ #\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF -THXC.ACU016.DS.COUNT = 6 +THXC.ACU016.DS.COUNT = 4 #\u65E0\u7EBF\u5BF9\u5C04\u8BBE\u5907\u7F16\u7801\u5217\u8868 -THXC.ACU016.DS.ZC.LIST = THXC.ACU016.J.RIR01;THXC.ACU016.J.RIR02;THXC.ACU016.J.RIR03;THXC.ACU016.J.SIR01;THXC.ACU016.J.SIR02;THXC.ACU016.J.SIR03 +THXC.ACU016.DS.ZC.LIST = THXC.ACU016.J.RIR01;THXC.ACU016.J.RIR02;THXC.ACU016.J.SIR01;THXC.ACU016.J.SIR02 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u8D77\u59CB\u5730\u5740 THXC.ACU016.DSALM.START = 38 #\u5BF9\u5C04\u62A5\u8B66\u72B6\u6001\u6240\u5360\u5B57\u6570 -THXC.ACU016.DSALM.WORDCOUNT = 2 +THXC.ACU016.DSALM.WORDCOUNT = 1 #\u98CE\u673A\u6570\u91CF diff --git a/src/com/szpg/service/ReadSensorValueService.java b/src/com/szpg/service/ReadSensorValueService.java index 3345ba9..fe2acb9 100644 --- a/src/com/szpg/service/ReadSensorValueService.java +++ b/src/com/szpg/service/ReadSensorValueService.java @@ -1,5 +1,6 @@ package com.szpg.service; +import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -26,6 +27,7 @@ private PgAcuCmdDao cmdDao = new PgAcuCmdDaoImpl(); private PgAcuDao acuDao = new PgAcuDaoImpl(); + private ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); public void executeService(ACUClient client, ReadMemoryCommand command) { // 解析命令对象为字节数组 @@ -52,6 +54,6 @@ // 4定时将数据库中的命令置为超时 int TIMEOUT = Integer.parseInt(Configure.getProperty("sys", "COMMAND_TIMEOUT", "2")); - new ScheduledThreadPoolExecutor(1).schedule(new RemoteCommandTimeoutTask(cmd.getId()), TIMEOUT, TimeUnit.MINUTES); + sche.schedule(new RemoteCommandTimeoutTask(cmd.getId()), TIMEOUT, TimeUnit.MINUTES); } }