From 41ba2fa12a59c14cfed1c226e71b06596ba0fe50 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期二, 28 十月 2025 16:28:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 18 ++++++++++++++++++
1 files changed, 18 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 5c51081..33e7b8c 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -22,6 +22,7 @@
import com.zy.common.CodeRes;
import com.zy.common.service.CommonService;
import com.zy.common.utils.News;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
@@ -31,6 +32,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 +46,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -69,6 +72,8 @@
private ConfigService configService;
@Autowired
private CommonService commonService;
+ @Autowired
+ private RedisUtil redisUtil;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -136,6 +141,7 @@
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vos.add(vo);
}
+ redisUtil.set("siteLatestData", JSON.toJSONString(vos));
return R.ok().add(vos);
}
@@ -180,6 +186,7 @@
vos.add(vo);
}
+ redisUtil.set("crnLatestData", JSON.toJSONString(vos));
return R.ok().add(vos);
}
@@ -333,4 +340,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();
+ }
+
}
--
Gitblit v1.9.1