From e089b826e5a3ca63da4732fc3c706c10d9b0d3d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 26 八月 2020 13:21:21 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/common.js | 2 +-
pom.xml | 2 +-
src/main/java/com/zy/core/thread/DevpThread.java | 27 +++++++++++++--------------
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index a209627..061300d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
</dependencies>
<build>
- <finalName>jswcs</finalName>
+ <finalName>gdwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index cc8c752..0352ad7 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -75,7 +75,7 @@
}
// 蹇冭烦
- heartbeat();
+// heartbeat();
Thread.sleep(400);
} catch (Exception e) {
e.printStackTrace();
@@ -105,7 +105,7 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read(){
- OperateResultExOne<byte[]> result = melsecMcNet.Read("DB100.0", (short) 40);
+ OperateResultExOne<byte[]> result = melsecMcNet.Read("D101", (short) 30);
if (result.IsSuccess) {
for (int i = 1; i <= 8; i++) {
StaProtocol staProtocol = station.get(i);
@@ -115,19 +115,18 @@
station.put(i, staProtocol);
}
staProtocol.setWorkNo(melsecMcNet.getByteTransform().TransInt16(result.Content, (i-1)*2)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(melsecMcNet.getByteTransform().TransInt16(result.Content, (i-1)*2+20)); // 鐩爣绔�
+ staProtocol.setStaNo(melsecMcNet.getByteTransform().TransInt16(result.Content, (i-1)*2+40)); // 鐩爣绔�
}
}
- OperateResultExOne<byte[]> result1 = melsecMcNet.Read("DB100.40", (short) 8);
+ OperateResultExOne<boolean[]> result1 = melsecMcNet.ReadBool("M800", (short) 64);
if (result1.IsSuccess) {
for (int i = 1; i <= 8; i++) {
- boolean[] status = melsecMcNet.getByteTransform().TransBool(result1.Content, i-1, 1);
StaProtocol staProtocol = station.get(i);
- staProtocol.setAutoing(status[0]); // 鑷姩
- staProtocol.setLoading(status[1]); // 鏈夌墿
- staProtocol.setInEnable(status[2]); // 鍙叆
- staProtocol.setOutEnable(status[3]);// 鍙嚭
- staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+ staProtocol.setAutoing(result1.Content[(i-1)*8]); // 鑷姩
+ staProtocol.setLoading(result1.Content[(i-1)*8+1]); // 鏈夌墿
+ staProtocol.setInEnable(result1.Content[(i-1)*8+2]); // 鍙叆
+ staProtocol.setOutEnable(result1.Content[(i-1)*8+3]);// 鍙嚭
+ staProtocol.setEmptyMk(result1.Content[(i-1)*8+4]); // 绌烘澘淇″彿
}
}
if (result.IsSuccess && result1.IsSuccess) {
@@ -162,8 +161,8 @@
if (null == staProtocol) {
return;
}
- OperateResult write = melsecMcNet.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- OperateResult write1 = melsecMcNet.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo()); // 鐩爣绔�
+ OperateResult write = melsecMcNet.Write("D10" + staProtocol.getSiteId(), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ OperateResult write1 = melsecMcNet.Write("D12" + staProtocol.getSiteId(), staProtocol.getStaNo()); // 鐩爣绔�
// boolean[] status = new boolean[8];
// status[0] = staProtocol.isAutoing();
// status[1] = staProtocol.isLoading();
@@ -186,7 +185,7 @@
if (null == staProtocol) {
return;
}
- OperateResult write = melsecMcNet.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ OperateResult write = melsecMcNet.Write("D10" + staProtocol.getSiteId(), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
if (!write.IsSuccess ) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
@@ -202,7 +201,7 @@
if (null == staProtocol) {
return;
}
- OperateResult write = melsecMcNet.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo()); // 鐩爣绔�
+ OperateResult write = melsecMcNet.Write("D12" + staProtocol.getSiteId(), staProtocol.getStaNo()); // 鐩爣绔�
if (!write.IsSuccess ) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 2009a2e..2f45f5f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jswcs";
+var baseUrl = "/gdwcs";
// 璧嬪��
function setVal(el, val) {
--
Gitblit v1.9.1