From c9dd6d06513365d464eb5c87d602ee2ac775f4a3 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 08 一月 2023 19:23:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 70 -----------------------------------
src/main/resources/application.yml | 14 +++---
2 files changed, 7 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 75493b6..796ecff 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -274,41 +274,6 @@
*/
@GetMapping("/led")
public R monitorLed(@RequestParam("ledId") Integer ledId) {
- switch (ledId){
- case 101:
- ledId=1;
- break;
- case 109:
- 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;
- }
String ledContent = "";
List<LedCommand> commandList = null;
for (LedSlave slave : slaveProperties.getLed()) {
@@ -328,41 +293,6 @@
*/
@GetMapping("/led/error")
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
- switch (ledId){
- case 101:
- ledId=1;
- break;
- case 109:
- 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;
- }
String errorMsg = "";
for (LedSlave slave : slaveProperties.getLed()) {
if (slave.getStaArr().contains(ledId)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b9e3ca7..398a814 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=lfdasrs
+ url: jdbc:sqlserver://10.10.10.251:1433;databasename=lfdasrs
username: sa
password: sa@123
mvc:
@@ -420,39 +420,39 @@
ip: 10.10.10.244
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 201
# LED7
led[6]:
id: 7
ip: 10.10.10.243
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 205
# LED8
led[7]:
id: 8
ip: 10.10.10.242
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 207
# LED9
led[8]:
id: 9
ip: 10.10.10.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 211
# LED10
led[9]:
id: 10
ip: 10.10.10.240
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 213
# LED11
led[10]:
id: 11
ip: 10.10.10.239
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
\ No newline at end of file
+ staArr: 217
\ No newline at end of file
--
Gitblit v1.9.1