diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
index 26673fe..892e175 100644
--- a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgSH findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
index 26673fe..892e175 100644
--- a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgSH findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
index 4b44ca6..f58f8cd 100644
--- a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgO2 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
index 26673fe..892e175 100644
--- a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgSH findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
index 4b44ca6..f58f8cd 100644
--- a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgO2 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
index 439e285..679b58f 100644
--- a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
@@ -120,8 +120,10 @@
@Override
public PgTemphum findLatestWsdzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
index 26673fe..892e175 100644
--- a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgSH findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
index 4b44ca6..f58f8cd 100644
--- a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgO2 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
index 439e285..679b58f 100644
--- a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
@@ -120,8 +120,10 @@
@Override
public PgTemphum findLatestWsdzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/data/PgFjStat.java b/src/com/szpg/db/data/PgFjStat.java
index 2e2b9da..3787e12 100644
--- a/src/com/szpg/db/data/PgFjStat.java
+++ b/src/com/szpg/db/data/PgFjStat.java
@@ -143,6 +143,7 @@
try {
json.put("time", this.getTmStr());
json.put("run", null != this.getRun() && this.getRun() == true ? URLEncoder.encode("风机启动", "UTF-8") : URLEncoder.encode("风机关闭", "UTF-8"));
+ json.put("runStat", null != this.getRun() && this.getRun() == true ? "1" : "0");
json.put("flt", null != this.getFlt() && this.getFlt() == true ? URLEncoder.encode("风机故障", "UTF-8") : URLEncoder.encode("正常", "UTF-8"));
json.put("am", null != this.getAm() && this.getAm() == true ? URLEncoder.encode("远控", "UTF-8") : URLEncoder.encode("就地", "UTF-8"));
} catch (JSONException e) {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
index 26673fe..892e175 100644
--- a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgSH findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
index 4b44ca6..f58f8cd 100644
--- a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgO2 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
index 439e285..679b58f 100644
--- a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
@@ -120,8 +120,10 @@
@Override
public PgTemphum findLatestWsdzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/data/PgFjStat.java b/src/com/szpg/db/data/PgFjStat.java
index 2e2b9da..3787e12 100644
--- a/src/com/szpg/db/data/PgFjStat.java
+++ b/src/com/szpg/db/data/PgFjStat.java
@@ -143,6 +143,7 @@
try {
json.put("time", this.getTmStr());
json.put("run", null != this.getRun() && this.getRun() == true ? URLEncoder.encode("风机启动", "UTF-8") : URLEncoder.encode("风机关闭", "UTF-8"));
+ json.put("runStat", null != this.getRun() && this.getRun() == true ? "1" : "0");
json.put("flt", null != this.getFlt() && this.getFlt() == true ? URLEncoder.encode("风机故障", "UTF-8") : URLEncoder.encode("正常", "UTF-8"));
json.put("am", null != this.getAm() && this.getAm() == true ? URLEncoder.encode("远控", "UTF-8") : URLEncoder.encode("就地", "UTF-8"));
} catch (JSONException e) {
diff --git a/src/com/szpg/db/data/PgJgStat.java b/src/com/szpg/db/data/PgJgStat.java
index d617ac8..b362a76 100644
--- a/src/com/szpg/db/data/PgJgStat.java
+++ b/src/com/szpg/db/data/PgJgStat.java
@@ -107,7 +107,8 @@
try {
json.put("time", this.getTmStr());
json.put("open", null != this.getJgopen() ? URLEncoder.encode(getJgopen(), "UTF-8") : "");
- json.put("lock", null != this.getJglock() && this.getJglock() == true ? URLEncoder.encode("井盖解锁", "UTF-8") : URLEncoder.encode("井盖锁定", "UTF-8"));
+ json.put("lock", null != this.getJglock() && this.getJglock() == true ? URLEncoder.encode("井盖锁定", "UTF-8") : URLEncoder.encode("井盖解锁", "UTF-8"));
+ json.put("runStat", null != this.getJglock() && this.getJglock() == true ? "0" : "1");
} catch (JSONException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
index 26673fe..892e175 100644
--- a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgSH findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
index 4b44ca6..f58f8cd 100644
--- a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgO2 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
index 439e285..679b58f 100644
--- a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
@@ -120,8 +120,10 @@
@Override
public PgTemphum findLatestWsdzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/data/PgFjStat.java b/src/com/szpg/db/data/PgFjStat.java
index 2e2b9da..3787e12 100644
--- a/src/com/szpg/db/data/PgFjStat.java
+++ b/src/com/szpg/db/data/PgFjStat.java
@@ -143,6 +143,7 @@
try {
json.put("time", this.getTmStr());
json.put("run", null != this.getRun() && this.getRun() == true ? URLEncoder.encode("风机启动", "UTF-8") : URLEncoder.encode("风机关闭", "UTF-8"));
+ json.put("runStat", null != this.getRun() && this.getRun() == true ? "1" : "0");
json.put("flt", null != this.getFlt() && this.getFlt() == true ? URLEncoder.encode("风机故障", "UTF-8") : URLEncoder.encode("正常", "UTF-8"));
json.put("am", null != this.getAm() && this.getAm() == true ? URLEncoder.encode("远控", "UTF-8") : URLEncoder.encode("就地", "UTF-8"));
} catch (JSONException e) {
diff --git a/src/com/szpg/db/data/PgJgStat.java b/src/com/szpg/db/data/PgJgStat.java
index d617ac8..b362a76 100644
--- a/src/com/szpg/db/data/PgJgStat.java
+++ b/src/com/szpg/db/data/PgJgStat.java
@@ -107,7 +107,8 @@
try {
json.put("time", this.getTmStr());
json.put("open", null != this.getJgopen() ? URLEncoder.encode(getJgopen(), "UTF-8") : "");
- json.put("lock", null != this.getJglock() && this.getJglock() == true ? URLEncoder.encode("井盖解锁", "UTF-8") : URLEncoder.encode("井盖锁定", "UTF-8"));
+ json.put("lock", null != this.getJglock() && this.getJglock() == true ? URLEncoder.encode("井盖锁定", "UTF-8") : URLEncoder.encode("井盖解锁", "UTF-8"));
+ json.put("runStat", null != this.getJglock() && this.getJglock() == true ? "0" : "1");
} catch (JSONException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
diff --git a/src/com/szpg/db/data/PgZmStat.java b/src/com/szpg/db/data/PgZmStat.java
index 024714f..a8cde88 100644
--- a/src/com/szpg/db/data/PgZmStat.java
+++ b/src/com/szpg/db/data/PgZmStat.java
@@ -125,6 +125,7 @@
try {
json.put("time", this.getTmStr());
json.put("run", null != this.getRun() && this.getRun() == true ? URLEncoder.encode("照明启动", "UTF-8") : URLEncoder.encode("照明关闭", "UTF-8"));
+ json.put("runStat", null != this.getRun() && this.getRun() == true ? "1" : "0");
} catch (JSONException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
diff --git a/WebRoot/device/alarm.jsp b/WebRoot/device/alarm.jsp
index f6ef215..9d05386 100644
--- a/WebRoot/device/alarm.jsp
+++ b/WebRoot/device/alarm.jsp
@@ -79,6 +79,7 @@
initACUList();
$("#rtStatus").on("click", remoteDsStatus);
+ $("#clearDs").on("click", clearDs);
$("#reload").on("click", reloadDsStatus);
});
@@ -154,6 +155,30 @@
}
}
+ function clearDs() {
+ var zcbh = $("#assetCode").text();
+ if (zcbh != "") {
+ $.ajax({
+ url: "remote/clearDsAlarm.action",
+ data: {zcbh: zcbh},
+ type: "json",
+ type: "POST",
+ success: function (response) {
+ swal({
+ title: "指令已下发",
+ text: "请等待10秒后自动刷新状态",
+ type: "info",
+ showConfirmButton: false,
+ timer: 2000
+ });
+ setTimeout(reloadDsStatus, 10000);
+ }
+ });
+ } else {
+ alert("资产编号为空");
+ }
+ }
+
// 向数据库查询最新值
function reloadDsStatus() {
var zcbh = $("#assetCode").text();
diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp
index 1bad4dc..ac12876 100644
--- a/WebRoot/device/ch4.jsp
+++ b/WebRoot/device/ch4.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp
index ab133c9..6ec3666 100644
--- a/WebRoot/device/co.jsp
+++ b/WebRoot/device/co.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp
index 2678744..1272a56 100644
--- a/WebRoot/device/hs.jsp
+++ b/WebRoot/device/hs.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp
index c0b31b5..8f8a41b 100644
--- a/WebRoot/device/o2.jsp
+++ b/WebRoot/device/o2.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp
index 2f5153b..1d586fe 100644
--- a/WebRoot/device/temp.jsp
+++ b/WebRoot/device/temp.jsp
@@ -106,6 +106,7 @@
dataType: "json",
type: "POST",
success: function(response) {
+ $("#devList").empty();
for (var i = 0; i < response.data.length; i++) {
var dev = response.data[i];
var liItem = $("").addClass("list-group-item").addClass("item-md").text(decodeURIComponent(dev.assetName));
diff --git a/src/ACUBL.properties b/src/ACUBL.properties
index 82761aa..8deba1f 100644
--- a/src/ACUBL.properties
+++ b/src/ACUBL.properties
@@ -99,10 +99,6 @@
THXC.ACU001.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -113,10 +109,6 @@
THXC.ACU001.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.SBSTAT.WORDCOUNT = 27
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.SBRT.WORDCOUNT = 84
#\u7167\u660E\u6570\u91CF
@@ -127,10 +119,6 @@
THXC.ACU001.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU001.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU001.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU001.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -253,10 +241,6 @@
THXC.ACU002.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -267,10 +251,6 @@
THXC.ACU002.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.SBSTAT.WORDCOUNT = 18
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.SBRT.WORDCOUNT = 66
#\u7167\u660E\u6570\u91CF
@@ -281,10 +261,6 @@
THXC.ACU002.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU002.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU002.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU002.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -407,24 +383,16 @@
THXC.ACU003.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU003.SB.COUNT = 14
+THXC.ACU003.SB.COUNT = 12
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.SSB05;THXC.ACU003.P.SSB06;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
+THXC.ACU003.SB.ZC.LIST = THXC.ACU003.P.DSB01;THXC.ACU003.P.DSB02;THXC.ACU003.P.DSB03;THXC.ACU003.P.DSB04;THXC.ACU003.P.SSB01;THXC.ACU003.P.SSB02;THXC.ACU003.P.SSB03;THXC.ACU003.P.SSB04;THXC.ACU003.P.RSB01;THXC.ACU003.P.RSB02;THXC.ACU003.P.RSB03;THXC.ACU003.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU003.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.SBSTAT.WORDCOUNT = 20
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.SBRT.WORDCOUNT = 70
#\u7167\u660E\u6570\u91CF
@@ -435,10 +403,6 @@
THXC.ACU003.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU003.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU003.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU003.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -561,10 +525,6 @@
THXC.ACU004.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -575,10 +535,6 @@
THXC.ACU004.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -589,10 +545,6 @@
THXC.ACU004.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU004.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU004.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU004.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -715,10 +667,6 @@
THXC.ACU005.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
@@ -729,10 +677,6 @@
THXC.ACU005.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -743,10 +687,6 @@
THXC.ACU005.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU005.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU005.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU005.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -756,7 +696,7 @@
#\u4E95\u76D6\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU005.JGSTAT.START = 3
#\u4E95\u76D6\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU005.JGSTAT.WORDCOUNT = 1
+THXC.ACU005.JGSTAT.WORDCOUNT = 6
#\u914D\u7535\u67DC\u6570\u91CF
@@ -869,38 +809,26 @@
THXC.ACU006.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.FJSTAT.WORDCOUNT = 3
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.FJRT.WORDCOUNT = 42
#\u6C34\u6CF5\u6570\u91CF
-THXC.ACU006.SB.COUNT = 19
+THXC.ACU006.SB.COUNT = 17
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
-THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.SSB07;THXC.ACU006.P.SSB08;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
+THXC.ACU006.SB.ZC.LIST = THXC.ACU006.P.DSB01;THXC.ACU006.P.DSB02;THXC.ACU006.P.DSB03;THXC.ACU006.P.DSB04;THXC.ACU006.P.DSB05;THXC.ACU006.P.DSB06;THXC.ACU006.P.SSB01;THXC.ACU006.P.SSB02;THXC.ACU006.P.SSB03;THXC.ACU006.P.SSB04;THXC.ACU006.P.SSB05;THXC.ACU006.P.SSB06;THXC.ACU006.P.RSB01;THXC.ACU006.P.RSB02;THXC.ACU006.P.RSB03;THXC.ACU006.P.RSB04;THXC.ACU006.P.RSB05
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBSTAT.WORDCOUNT = 30
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.SBRT.WORDCOUNT = 90
+THXC.ACU006.SBSTAT.WORDCOUNT = 28
#\u7167\u660E\u6570\u91CF
THXC.ACU006.ZM.COUNT = 3
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.RZM01;THXC.ACU006.Z.RZM02;THXC.ACU006.Z.RZM03
+THXC.ACU006.ZM.ZC.LIST = THXC.ACU006.Z.DZM01;THXC.ACU006.Z.SZM01;THXC.ACU006.Z.RZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU006.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU006.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU006.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU006.ZMRT.WORDCOUNT = 16
#\u4E95\u76D6\u6570\u91CF
@@ -1023,10 +951,6 @@
THXC.ACU008.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1037,10 +961,6 @@
THXC.ACU008.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.SBSTAT.WORDCOUNT = 13
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1051,10 +971,6 @@
THXC.ACU008.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU008.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU008.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU008.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1177,10 +1093,6 @@
THXC.ACU009.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1191,10 +1103,6 @@
THXC.ACU009.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.SBSTAT.WORDCOUNT = 16
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.SBRT.WORDCOUNT = 62
#\u7167\u660E\u6570\u91CF
@@ -1205,10 +1113,6 @@
THXC.ACU009.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU009.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU009.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU009.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1331,10 +1235,6 @@
THXC.ACU010.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1345,10 +1245,6 @@
THXC.ACU010.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.SBSTAT.WORDCOUNT = 15
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.SBRT.WORDCOUNT = 60
#\u7167\u660E\u6570\u91CF
@@ -1359,10 +1255,6 @@
THXC.ACU010.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU010.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU010.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU010.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1485,10 +1377,6 @@
THXC.ACU011.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1499,10 +1387,6 @@
THXC.ACU011.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.SBSTAT.WORDCOUNT = 12
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.SBRT.WORDCOUNT = 54
#\u7167\u660E\u6570\u91CF
@@ -1513,10 +1397,6 @@
THXC.ACU011.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU011.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU011.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU011.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1639,10 +1519,6 @@
THXC.ACU013.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1653,10 +1529,6 @@
THXC.ACU013.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.SBSTAT.WORDCOUNT = 17
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.SBRT.WORDCOUNT = 64
#\u7167\u660E\u6570\u91CF
@@ -1667,10 +1539,6 @@
THXC.ACU013.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU013.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU013.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU013.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1793,10 +1661,6 @@
THXC.ACU014.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1807,24 +1671,16 @@
THXC.ACU014.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.SBSTAT.WORDCOUNT = 11
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.SBRT.WORDCOUNT = 52
#\u7167\u660E\u6570\u91CF
THXC.ACU014.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU014.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU014.ZM.ZC.LIST = THXC.ACU014.Z.RZM01;THXC.ACU014.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU014.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU014.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU014.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU014.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -1948,10 +1804,6 @@
THXC.ACU015.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.FJRT.WORDCOUNT = 38
#\u6C34\u6CF5\u6570\u91CF
@@ -1959,27 +1811,19 @@
#\u6C34\u6CF5\u7F16\u7801\u5217\u8868
THXC.ACU015.SB.ZC.LIST = THXC.ACU015.P.SSB01;THXC.ACU015.P.SSB02;THXC.ACU015.P.SSB03;THXC.ACU015.P.SSB04;THXC.ACU015.P.RSB01;THXC.ACU015.P.RSB02;THXC.ACU015.P.RSB03;THXC.ACU015.P.RSB04
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBSTAT.START = 5
+THXC.ACU015.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBSTAT.WORDCOUNT = 3
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.SBRT.WORDCOUNT = 54
+THXC.ACU015.SBSTAT.WORDCOUNT = 12
#\u7167\u660E\u6570\u91CF
THXC.ACU015.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU015.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU015.ZM.ZC.LIST = THXC.ACU015.Z.RZM01;THXC.ACU015.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU015.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU015.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU015.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU015.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
@@ -2086,27 +1930,23 @@
#\u5BF9\u5C04\u4F20\u611F\u5668\u6570\u91CF
-THXC.ACU016.DS.COUNT = 4
+THXC.ACU016.DS.COUNT = 6
#\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.SIR01;THXC.ACU016.J.SIR02
+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
#\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 = 1
+THXC.ACU016.DSALM.WORDCOUNT = 2
#\u98CE\u673A\u6570\u91CF
-THXC.ACU016.FJ.COUNT = 4
+THXC.ACU016.FJ.COUNT = 2
#\u98CE\u673A\u7F16\u7801\u5217\u8868
-THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01;THXC.ACU016.F.SFJ02;THXC.ACU016.F.RFJ02
+THXC.ACU016.FJ.ZC.LIST = THXC.ACU016.F.SFJ01;THXC.ACU016.F.RFJ01
#\u98CE\u673A\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.FJSTAT.START = 16
#\u98CE\u673A\u72B6\u6001\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJSTAT.WORDCOUNT = 2
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.FJRT.START = 200
-#\u98CE\u673A\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.FJRT.WORDCOUNT = 38
+THXC.ACU016.FJSTAT.WORDCOUNT = 1
#\u6C34\u6CF5\u6570\u91CF
@@ -2117,24 +1957,16 @@
THXC.ACU016.SBSTAT.START = 50
#\u6C34\u6CF5\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.SBSTAT.WORDCOUNT = 10
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.SBRT.START = 100
-#\u6C34\u6CF5\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.SBRT.WORDCOUNT = 50
#\u7167\u660E\u6570\u91CF
THXC.ACU016.ZM.COUNT = 2
#\u7167\u660E\u7F16\u7801\u5217\u8868
-THXC.ACU016.ZM.ZC.LIST = THXC.ACU002.Z.RZM01;THXC.ACU002.Z.SZM01
+THXC.ACU016.ZM.ZC.LIST = THXC.ACU016.Z.RZM01;THXC.ACU016.Z.SZM01
#\u7167\u660E\u72B6\u6001\u8D77\u59CB\u5730\u5740
THXC.ACU016.ZMSTAT.START = 2
#\u7167\u660E\u72B6\u6001\u6240\u5360\u5B57\u6570
THXC.ACU016.ZMSTAT.WORDCOUNT = 1
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u8D77\u59CB\u5730\u5740
-THXC.ACU016.ZMRT.START = 70
-#\u7167\u660E\u8FD0\u884C\u65F6\u957F\u6240\u5360\u5B57\u6570
-THXC.ACU016.ZMRT.WORDCOUNT = 14
#\u4E95\u76D6\u6570\u91CF
diff --git a/src/com/szpg/db/dao/impl/PgCODaoImpl.java b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
index 5d8aa17..186ac16 100644
--- a/src/com/szpg/db/dao/impl/PgCODaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCODaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgCO findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CO, LOGTIME, PGDEVICEID FROM PG_CO WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
index 592a178..0ed139e 100644
--- a/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgCh4DaoImpl.java
@@ -119,8 +119,10 @@
@Override
public PgCh4 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, CH4, LOGTIME, PGDEVICEID FROM PG_CH4 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
index 26673fe..892e175 100644
--- a/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgHSDaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgSH findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, SH, LOGTIME, PGDEVICEID FROM PG_SH WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
index 4b44ca6..f58f8cd 100644
--- a/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgO2DaoImpl.java
@@ -118,8 +118,10 @@
@Override
public PgO2 findLatestPblzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, O2, LOGTIME, PGDEVICEID FROM PG_O2 WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
index 439e285..679b58f 100644
--- a/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
+++ b/src/com/szpg/db/dao/impl/PgWsDaoImpl.java
@@ -120,8 +120,10 @@
@Override
public PgTemphum findLatestWsdzByDevice(Integer deviceid) {
Connection conn = null;
-
- String queryStr = "SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? AND ROWNUM <= 5 ORDER BY LOGTIME DESC";
+
+ String queryStr = "SELECT A.* FROM " +
+ "(SELECT ID, TEMP, HUM, LOGTIME, PGDEVICEID FROM PG_TEMPHUM WHERE PGDEVICEID = ? ORDER BY LOGTIME DESC) A " +
+ "WHERE ROWNUM <= 1";
Object[] param = new Object[1];
param[0] = deviceid;
try {
diff --git a/src/com/szpg/db/data/PgFjStat.java b/src/com/szpg/db/data/PgFjStat.java
index 2e2b9da..3787e12 100644
--- a/src/com/szpg/db/data/PgFjStat.java
+++ b/src/com/szpg/db/data/PgFjStat.java
@@ -143,6 +143,7 @@
try {
json.put("time", this.getTmStr());
json.put("run", null != this.getRun() && this.getRun() == true ? URLEncoder.encode("风机启动", "UTF-8") : URLEncoder.encode("风机关闭", "UTF-8"));
+ json.put("runStat", null != this.getRun() && this.getRun() == true ? "1" : "0");
json.put("flt", null != this.getFlt() && this.getFlt() == true ? URLEncoder.encode("风机故障", "UTF-8") : URLEncoder.encode("正常", "UTF-8"));
json.put("am", null != this.getAm() && this.getAm() == true ? URLEncoder.encode("远控", "UTF-8") : URLEncoder.encode("就地", "UTF-8"));
} catch (JSONException e) {
diff --git a/src/com/szpg/db/data/PgJgStat.java b/src/com/szpg/db/data/PgJgStat.java
index d617ac8..b362a76 100644
--- a/src/com/szpg/db/data/PgJgStat.java
+++ b/src/com/szpg/db/data/PgJgStat.java
@@ -107,7 +107,8 @@
try {
json.put("time", this.getTmStr());
json.put("open", null != this.getJgopen() ? URLEncoder.encode(getJgopen(), "UTF-8") : "");
- json.put("lock", null != this.getJglock() && this.getJglock() == true ? URLEncoder.encode("井盖解锁", "UTF-8") : URLEncoder.encode("井盖锁定", "UTF-8"));
+ json.put("lock", null != this.getJglock() && this.getJglock() == true ? URLEncoder.encode("井盖锁定", "UTF-8") : URLEncoder.encode("井盖解锁", "UTF-8"));
+ json.put("runStat", null != this.getJglock() && this.getJglock() == true ? "0" : "1");
} catch (JSONException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
diff --git a/src/com/szpg/db/data/PgZmStat.java b/src/com/szpg/db/data/PgZmStat.java
index 024714f..a8cde88 100644
--- a/src/com/szpg/db/data/PgZmStat.java
+++ b/src/com/szpg/db/data/PgZmStat.java
@@ -125,6 +125,7 @@
try {
json.put("time", this.getTmStr());
json.put("run", null != this.getRun() && this.getRun() == true ? URLEncoder.encode("照明启动", "UTF-8") : URLEncoder.encode("照明关闭", "UTF-8"));
+ json.put("runStat", null != this.getRun() && this.getRun() == true ? "1" : "0");
} catch (JSONException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java
index 8ea7aca..4fcde7b 100644
--- a/src/com/szpg/plc/PGDSCServlet.java
+++ b/src/com/szpg/plc/PGDSCServlet.java
@@ -66,48 +66,48 @@
}
// 3启动查询温湿度的定时任务
-// sendQueryWSValueCommand();
-// sendSetWSThresholdCommand();
+ sendQueryWSValueCommand();
+ sendSetWSThresholdCommand();
// 4启动查询甲烷的定时任务
-// sendQueryCH4ValueCommand();
-// sendSetCH4ThresholdCommand();
+ sendQueryCH4ValueCommand();
+ sendSetCH4ThresholdCommand();
// 5启动查询一氧化碳的定时任务
-// sendQueryCOValueCommand();
-// sendSetCOThresholdCommand();
+ sendQueryCOValueCommand();
+ sendSetCOThresholdCommand();
// 6氧气
-// sendQueryO2ValueCommand();
-// sendSetO2ThresholdCommand();
+ sendQueryO2ValueCommand();
+ sendSetO2ThresholdCommand();
// 7硫化氢
-// sendQueryHSValueCommand();
-// sendSetHSThresholdCommand();
+ sendQueryHSValueCommand();
+ sendSetHSThresholdCommand();
// 8对射报警
-// sendQueryDSStatusCommand();
+ sendQueryDSStatusCommand();
// 9液位报警
-// sendQueryYWStatusCommand();
+ sendQueryYWStatusCommand();
// 10风机状态
-// sendQueryFJStatusCommand();
+ sendQueryFJStatusCommand();
// 11照明状态
-// sendQueryZMStatusCommand();
+ sendQueryZMStatusCommand();
// 12水泵状态
-// sendQuerySBStatusCommand();
+ sendQuerySBStatusCommand();
// 13井盖状态
-// sendQueryJGStatusCommand();
+ sendQueryJGStatusCommand();
//10巡检数据同步
-// synchAssetInSpection();
+ synchAssetInSpection();
//运维数据同步
-// synchMaintanceRecord();
+ synchMaintanceRecord();
// 查询二期温湿度氧气实时数据
// sendQueryWSYQValueCommand();