From 371272c50c94b364aed0efec4871aefa85ff0a27 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 14:43:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/RouterController.java | 7 ++++---
src/main/webapp/views/monitor/js/monitor.js | 2 +-
src/main/java/com/zy/asrs/controller/MonitorController.java | 4 ++--
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 16 ++++++++--------
src/main/resources/application.yml | 14 ++++++++++++++
5 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 27c8c85..d482cf0 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -57,7 +57,7 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId) {
+ public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
Double zSpeed = 0.0D;
@@ -98,7 +98,7 @@
}
// 鑾峰彇杈撻�佺嚎plc绾跨▼
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, crnId);
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
String ledContent = ledThread.getStringBuffer().toString();
// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index ea841de..83c835b 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -43,12 +43,13 @@
}
}
- @RequestMapping("/monitor/{cnrId}")
+ @RequestMapping("/monitor/{cnrId}/{ledId}")
public void monitor(@PathVariable("cnrId") Integer cnrId,
+ @PathVariable("ledId") Integer ledId,
HttpServletResponse response) {
try{
- String append = cnrId==null?"":("?crnId="+cnrId);
- response.sendRedirect(contextPath+"/views/monitor/monitor.html"+append);
+
+ response.sendRedirect(contextPath+"/views/monitor/monitor.html"+ "?" + "crnId=" + cnrId + "&" + "ledId=" + ledId);
} catch (Exception ex){
ex.printStackTrace();
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 2110fc1..6fbaa43 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -271,37 +271,37 @@
/**
* X琛岃蛋绾块�熷害m/min
*/
- private Float xSpeed;
+ private Float xSpeed = 0F;
/**
* Y琛岃蛋绾块�熷害m/min
*/
- private Float ySpeed;
+ private Float ySpeed = 0F;
/**
* Z琛岃蛋绾块�熷害m/min
*/
- private Float zSpeed;
+ private Float zSpeed = 0F;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
*/
- public Float xDistance;
+ public Float xDistance = 0F;
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
*/
- public Float yDistance;
+ public Float yDistance = 0F;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
*/
- public Float xDuration;
+ public Float xDuration = 0F;
- /**
+ /**w
* 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
*/
- public Float yDuration;
+ public Float yDuration = 0F;
public void setMode(Short mode) {
this.mode = mode;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 61d598f..162e44e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -157,6 +157,20 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 109,113,103,200,203 # todo:luxiaotao
+ # LED2
+ led[1]:
+ id: 2
+ ip: 192.168.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 109,113,103,200,203 # todo:luxiaotao
+ # LED3
+ led[2]:
+ id: 2
+ ip: 192.168.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 109,113,103,200,203 # todo:luxiaotao
# 纾呯О
# scale[0]:
# id: 1
diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index 5fc35d8..c99b0f8 100644
--- a/src/main/webapp/views/monitor/js/monitor.js
+++ b/src/main/webapp/views/monitor/js/monitor.js
@@ -53,7 +53,7 @@
* 鑾峰彇鍏朵粬鏁版嵁
*/
function getOther() {
- http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId")}, function (res) {
+ http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId"), ledId: getUrlVal("ledId")}, function (res) {
if (res.code === 200){
// 宸�
--
Gitblit v1.9.1