From 715101e29ad1eb8d70f587237a37d74d50d3fd2a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 15:23:28 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/controller/TVController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index bdaeea5..37b8cd5 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -225,15 +225,15 @@
*/
@GetMapping("/led")
public R monitorLed(@RequestParam("ledId") Integer ledId) {
- int dev_no = 1011;
+ int dev_no = 1012;
if (ledId == 1) {
- dev_no = 1011;
+ dev_no = 1012;
} else if (ledId == 2) {
dev_no = 1014;
} else if (ledId == 3) {
dev_no = 1021;
} else if (ledId == 4) {
- dev_no = 1025;
+ dev_no = 1024;
}
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", dev_no));
if (Cools.isEmpty(basDevp)) {
@@ -242,9 +242,12 @@
if (Cools.isEmpty(basDevp.getWrkNo1())) {
return R.ok();
}
+ if (basDevp.getWrkNo() == null || basDevp.getWrkNo() == 0) {
+ return R.ok();
+ }
List<LedCommand> commands = new ArrayList<>();
Map<String, Object> param = new HashMap<>();
- param.put("taskNo", basDevp.getWrkNo1());
+ param.put("taskNo", basDevp.getWrkNo());
String response = null;
try {
response = new HttpHandler.Builder()
@@ -262,6 +265,8 @@
String data = jsonObject.getString("data");
List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
commands.addAll(wrkDetls);
+ } else {
+ return R.ok();
}
return R.ok().add(commands);
}
--
Gitblit v1.9.1