From ede6255e91ce3c3eae7fc90f8ee2f1a49e5574cf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 24 九月 2020 09:43:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2 +-
src/main/webapp/views/console.html | 4 ++--
src/main/java/com/zy/core/thread/DevpThread.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index a050efb..71f9030 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -44,7 +44,7 @@
private boolean pakMk = true;
// 鍙拌溅浣嶇疆
- private Integer position;
+ private Short position;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 55be879..c21956a 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -139,10 +139,11 @@
}
}
// 鍙拌溅浣嶇疆
- OperateResultExOne<Integer> result2 = siemensS7Net.ReadInt32("DB100.48");
+ OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB100.48");
if (result2.IsSuccess) {
StaProtocol staProtocol = station.get(8);
staProtocol.setPosition(result2.Content);
+// System.out.println("8鍙风珯浣嶇疆锛�"+result2.Content);
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆�8鍙峰彴杞﹁幏鍙栧疄鏃朵綅缃け璐ワ紒锛侊紒", DateUtils.convert(new Date())));
log.error("8鍙峰彴杞﹁幏鍙栧疄鏃朵綅缃け璐ワ紒锛侊紒");
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e4f79aa..e763ea9 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -512,8 +512,8 @@
} else {
siteEl.html(sites[i].siteId);
}
- if (i===8) {
- carAnimate(i, Number(sites[i].nearbySta));
+ if (i+1===8) {
+ carAnimate(i+1, Number(sites[i].nearbySta));
}
}
} else if (res.code === 403){
--
Gitblit v1.9.1