From 4c30a5d4e4d35b3d78355f0c2d8edf90b31a1b23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 九月 2020 14:55:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +++
src/main/java/com/zy/asrs/controller/ConsoleController.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 ++++++++++----------
src/main/webapp/views/console.html | 3 +++
src/main/java/com/zy/core/thread/DevpThread.java | 12 +++++++++++-
5 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 4554412..e637dc3 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -99,6 +99,7 @@
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+ vo.setNearbySta(String.valueOf(staProtocol.getPosition())); // 鍙拌溅浣嶇疆
vos.add(vo);
}
return R.ok().add(vos);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index e04f125..c31e4dd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -282,16 +282,6 @@
continue;
}
- // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- staProtocol.setPakMk(false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (!result) {
- log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
- continue;
- }
-
try {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
@@ -325,6 +315,16 @@
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ continue;
+ }
+
+ // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ staProtocol.setPakMk(false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
}
}
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 4cc0e75..a050efb 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -43,6 +43,9 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
+ // 鍙拌溅浣嶇疆
+ private Integer position;
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 9ed86e6..55be879 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -138,6 +138,16 @@
}
}
}
+ // 鍙拌溅浣嶇疆
+ OperateResultExOne<Integer> result2 = siemensS7Net.ReadInt32("DB100.48");
+ if (result2.IsSuccess) {
+ StaProtocol staProtocol = station.get(8);
+ staProtocol.setPosition(result2.Content);
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆�8鍙峰彴杞﹁幏鍙栧疄鏃朵綅缃け璐ワ紒锛侊紒", DateUtils.convert(new Date())));
+ log.error("8鍙峰彴杞﹁幏鍙栧疄鏃朵綅缃け璐ワ紒锛侊紒");
+ }
+
if (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -172,7 +182,7 @@
return;
}
OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(100);
+ Thread.sleep(300);
OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo()); // 鐩爣绔�
// boolean[] status = new boolean[8];
// status[0] = staProtocol.isAutoing();
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 1cd0fb9..e4f79aa 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -512,6 +512,9 @@
} else {
siteEl.html(sites[i].siteId);
}
+ if (i===8) {
+ carAnimate(i, Number(sites[i].nearbySta));
+ }
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
--
Gitblit v1.9.1