From 292ad975aaa9f3a4a74ac2a3f89b5cf3bf9a1bbb Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 17:47:40 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/controller/TVController.java | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 37b8cd5..1b8e616 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -23,6 +23,7 @@
import com.zy.common.model.SearchLocParam;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
@@ -33,6 +34,7 @@
import com.zy.core.thread.LedThread;
import com.zy.core.thread.ShuttleThread;
import com.zy.core.thread.impl.NormalLedThread;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +49,7 @@
/**
* Created by vincent on 2020/11/16
*/
+@Slf4j
@RestController
@RequestMapping("/monitor")
public class TVController {
@@ -66,6 +69,9 @@
private SlaveProperties slaveProperties;
@Autowired
private BasShuttleErrService basShuttleErrService;
+
+ @Autowired
+ private RedisUtil redisUtil;
@Value("${asrs.wmsUrl}")
private String wmsUrl;
@@ -245,30 +251,13 @@
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.getWrkNo());
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/led/getTask2")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- } catch (IOException e) {
- e.printStackTrace();
+ Object o = redisUtil.get("LED_" + dev_no);
+ if (o != null) {
+ log.info("鐢佃鏈烘樉绀猴細{}",JSONObject.toJSONString(o));
+ return R.ok().add(o);
}
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- 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);
+ return R.ok();
+
}
/**
--
Gitblit v1.9.1