From d15f2d6c0eb8abf9c40f30aa729c90bdc1db883f Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 27 十二月 2022 10:49:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 35 +++++++++++++++++
src/main/resources/application.yml | 44 +++++++++++-----------
2 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 8977b4f..32f943a 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -58,6 +58,41 @@
*/
@GetMapping("/other")
public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
+ switch (ledId){
+ case 101:
+ ledId=1;
+ break;
+ case 107:
+ ledId=2;
+ break;
+ case 117:
+ ledId=3;
+ break;
+ case 126:
+ ledId=4;
+ break;
+ case 134:
+ ledId=5;
+ break;
+ case 201:
+ ledId=6;
+ break;
+ case 205:
+ ledId=7;
+ break;
+ case 207:
+ ledId=8;
+ break;
+ case 211:
+ ledId=9;
+ break;
+ case 213:
+ ledId=10;
+ break;
+ case 217:
+ ledId=11;
+ break;
+ }
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
Double zSpeed = 0.0D;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 08eff50..b9e3ca7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8081/lfdwms
+ url: localhost:8080/lfdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -382,77 +382,77 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.249
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 015
+ staArr: 101
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.248
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 109
# LED3
led[2]:
id: 3
- ip: 10.10.10.202
+ ip: 10.10.10.247
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 117
# LED4
led[3]:
id: 4
- ip: 10.10.10.202
+ ip: 10.10.10.246
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 126
# LED5
led[4]:
id: 5
- ip: 10.10.10.202
+ ip: 10.10.10.245
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 134
# LED6
led[5]:
id: 6
- ip: 10.10.10.202
+ ip: 10.10.10.244
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 011
# LED7
led[6]:
- id: 6
- ip: 10.10.10.202
+ id: 7
+ ip: 10.10.10.243
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 011
# LED8
led[7]:
- id: 5
- ip: 10.10.10.202
+ id: 8
+ ip: 10.10.10.242
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 011
# LED9
led[8]:
- id: 6
- ip: 10.10.10.202
+ id: 9
+ ip: 10.10.10.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 011
# LED10
led[9]:
- id: 6
- ip: 10.10.10.202
+ id: 10
+ ip: 10.10.10.240
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 011
# LED11
led[10]:
- id: 6
- ip: 10.10.10.202
+ id: 11
+ ip: 10.10.10.239
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 011
\ No newline at end of file
--
Gitblit v1.9.1