From d34366b9d348f47a8083aa3dd2e3e0efa2377dcf Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 20:57:18 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/controller/TVController.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 1b8e616..d797b27 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -231,30 +231,37 @@
*/
@GetMapping("/led")
public R monitorLed(@RequestParam("ledId") Integer ledId) {
- int dev_no = 1012;
+ int dev_no1 = 1011;
+ int dev_no2 = 1012;
+ int dev_no3 = 1015;
if (ledId == 1) {
- dev_no = 1012;
+ dev_no1 = 1011;
+ dev_no2 = 1012;
} else if (ledId == 2) {
- dev_no = 1014;
+ dev_no1 = 1013;
+ dev_no2 = 1015;
+ dev_no3 = 1015;
} else if (ledId == 3) {
- dev_no = 1021;
+ dev_no1 = 1021;
+ dev_no2 = 1022;
+ dev_no3 = 1023;
} else if (ledId == 4) {
- dev_no = 1024;
+ dev_no1 = 1024;
+ dev_no2 = 1025;
+ dev_no3 = 1026;
}
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", dev_no));
- if (Cools.isEmpty(basDevp)) {
- return R.ok();
- }
- if (Cools.isEmpty(basDevp.getWrkNo1())) {
- return R.ok();
- }
- if (basDevp.getWrkNo() == null || basDevp.getWrkNo() == 0) {
- return R.ok();
- }
- Object o = redisUtil.get("LED_" + dev_no);
- if (o != null) {
- log.info("鐢佃鏈烘樉绀猴細{}",JSONObject.toJSONString(o));
- return R.ok().add(o);
+ Object o1 = redisUtil.get("LED_" + dev_no1);
+ Object o2 = redisUtil.get("LED_" + dev_no2);
+ Object o3 = redisUtil.get("LED_" + dev_no3);
+ if (o1 != null) {
+ log.info("鐢佃鏈烘樉绀�1锛歿}", JSONObject.toJSONString(o1));
+ return R.ok().add(o1);
+ } else if (o2 != null) {
+ log.info("鐢佃鏈烘樉绀�2锛歿}", JSONObject.toJSONString(o2));
+ return R.ok().add(o2);
+ } else if (o3 != null) {
+ log.info("鐢佃鏈烘樉绀�3锛歿}", JSONObject.toJSONString(o3));
+ return R.ok().add(o3);
}
return R.ok();
--
Gitblit v1.9.1