From bc9cc84b5d074076692eedf4951584bb17f8985f Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 29 一月 2026 16:38:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c887cb7..7028f51 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -67,19 +67,20 @@
@GetMapping("/getLedInfos")
public R getLedInfos(HttpServletRequest request) {
+ HashMap<String, Object> map = new HashMap<>();
String remoteAddr = request.getRemoteAddr();
TvDevice tvDevice = tvDeviceService.selectOne(
new EntityWrapper<TvDevice>().eq("ip", remoteAddr));
if (tvDevice == null) {
return R.error("鏈壘鍒癐P瀵瑰簲鐨勭數瑙嗘満璁惧: " + remoteAddr);
}
+ map.put("deviceName", tvDevice.getName());
List<BasStationTv> relations = basStationTvService
.selectList(new EntityWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
if (relations == null || relations.isEmpty()) {
- R r = R.ok();
- r.put("data", new ArrayList<>());
- return r;
+ map.put("data", new ArrayList<>());
+ return R.ok().add(map);
}
@@ -133,9 +134,8 @@
list.add(tvDataDto);
}
- HashMap<String, Object> map = new HashMap<>();
+
map.put("data", list);
- map.put("deviceName", tvDevice.getName());
return R.ok().add(map);
}
--
Gitblit v1.9.1