From ff10d824fa44c8d764f64f65fb97ac3aa392293c Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期三, 17 九月 2025 10:42:01 +0800
Subject: [PATCH] LED ADB
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 14 ++++++++++++++
src/main/java/com/zy/core/model/LedSlave.java | 3 +++
src/main/resources/application.yml | 2 ++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index ec27772..7eb87e3 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -29,6 +29,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
@@ -42,6 +43,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -388,4 +390,16 @@
return R.ok().add(JSON.toJSONString(jsonObjects));
}
+ //led ADB
+ @GetMapping("/getLedInfos")
+ public R getLedInfos(HttpServletRequest request) {
+ String remoteAddr = request.getRemoteAddr();
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getIp().equals(remoteAddr)) {
+ return R.ok().add(slave);
+ }
+ }
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/core/model/LedSlave.java b/src/main/java/com/zy/core/model/LedSlave.java
index af02dfc..8b6ab5a 100644
--- a/src/main/java/com/zy/core/model/LedSlave.java
+++ b/src/main/java/com/zy/core/model/LedSlave.java
@@ -21,4 +21,7 @@
// 鍙夎溅绔欑偣鏁扮粍
private List<Integer> staArr = new ArrayList<>();
+ //led ADB
+ private Integer crnId;
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ecff19e..89b40e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -146,6 +146,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 102
+ crnId: 1
# LED2
led[1]:
id: 123
@@ -153,4 +154,5 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 104
+ crnId: 1
--
Gitblit v1.9.1