From b7951bdbb8925131cbc76be4902fcef0e88d0506 Mon Sep 17 00:00:00 2001 From: ytfl <ytfl@qq.com> Date: 星期二, 19 八月 2025 18:22:03 +0800 Subject: [PATCH] #自动获取电视机配置信息 --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 13 +++++++++++++ src/main/resources/application.yml | 18 +++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index 5c51081..8a0ce35 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -31,6 +31,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.protocol.CrnProtocol; import com.zy.core.model.protocol.StaProtocol; import com.zy.core.properties.SlaveProperties; @@ -44,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.*; /** @@ -333,4 +335,15 @@ return R.ok().add(JSON.toJSONString(jsonObjects)); } + @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/resources/application.yml b/src/main/resources/application.yml index 469d597..fbd1634 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -293,63 +293,63 @@ # LED1 led[0]: id: 1 - ip: 10.10.11.210 + ip: 172.17.60.188 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 1008 # LED2 led[1]: id: 2 - ip: 10.10.11.210 + ip: 172.17.60.183 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 1075 # LED3 led[2]: id: 3 - ip: 10.10.11.210 + ip: 172.17.60.181 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 1058 # LED4 led[3]: id: 4 - ip: 10.10.11.210 + ip: 172.17.60.184 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 1064 # LED5 led[4]: id: 5 - ip: 10.10.11.210 + ip: 172.17.60.185 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 1068 # LED6 led[5]: id: 6 - ip: 10.10.11.210 + ip: 172.17.60.186 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 1071 # LED7 led[6]: id: 7 - ip: 10.10.11.210 + ip: 172.17.60.182 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 1074 # LED8 led[7]: id: 8 - ip: 10.10.11.210 + ip: 172.17.60.187 port: 5005 devpPlcId: ${wcs-slave.devp[1].id} staArr: 1001 # LED9 led[8]: id: 9 - ip: 10.10.11.210 + ip: 172.17.60.188 port: 5005 devpPlcId: ${wcs-slave.devp[1].id} staArr: 1007 \ No newline at end of file -- Gitblit v1.9.1