From 6a82697564dc4dd50e43fe74cd5ae305a7a18ede Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 04 八月 2022 11:13:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 14 +++++++-------
src/main/java/com/zy/core/enums/CrnStatusType.java | 2 +-
src/main/webapp/views/crn.html | 1 +
src/main/webapp/views/pipeline.html | 4 +++-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 ++--
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index b680737..371c87f 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -34,7 +34,7 @@
return type;
}
}
- return null;
+ return NONE;
}
public static CrnStatusType get(CrnStatusType type) {
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 65343df..31b9ff5 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -147,7 +147,7 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 70);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
@@ -167,12 +167,12 @@
crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30));
- crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 34));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+ crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+ crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
+ crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
+ crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d971acd..2917e1a 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -146,11 +146,11 @@
// }
// }
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB150.0", (short) (staNoSize*2));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 3999603..3a5ce8f 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -486,6 +486,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
+ console.log(res)
if (res.code === 200) {
crnOutput(res.data);
} else if (res.code === 403) {
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 01be111..822c9d8 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -147,7 +147,8 @@
},500);
function starGetSite() {
if (stop) {
- return
+ getSite();
+ // return
} else {
getSite();
}
@@ -187,6 +188,7 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
+ console.log(res)
var table = res.data;
if (table.length > siteTableBlankRows && table.length !== siteTableFullRows) {
initSiteTable(table.length-siteTableBlankRows);
--
Gitblit v1.9.1