From ee6e7a5260183a0ac977d6ff21fe3de6f70d3bdd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 18 六月 2024 16:56:40 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java | 70 +++++++++++++++++-----------------
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
index 69d12f3..be4dc2f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
@@ -137,7 +137,7 @@
@PostMapping("/basLift/getMapLev")
public R getMapLev() {
List<Dict> dicts = dictService.list(new LambdaQueryWrapper<Dict>()
- .like(Dict::getFlag, "map")
+ .like(Dict::getFlag, "map-")
.eq(Dict::getStatus, 1));
return R.ok().add(dicts.size());
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
index fd39de0..835a6d8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
@@ -92,7 +92,7 @@
//妯″紡
liftProtocol.setModel(true);
//杩愯鐘舵��
- liftProtocol.setRun(data.getInteger("runningstate") == 1);
+ liftProtocol.setRun(data.getInteger("runningState") == 1);
//灏辩华鐘舵��
liftProtocol.setReady(data.getInteger("readyState") == 1);
//鏈夋墭鐩�
@@ -100,7 +100,7 @@
//鏈夊皬杞�
liftProtocol.setHasCar(data.getString("haveCar").equals("Y"));
//鏁呴殰鐮�
- liftProtocol.setErrorCode("");
+ liftProtocol.setErrorCode("0");
//灞�
liftProtocol.setLev(data.getInteger("curFloor"));
@@ -346,9 +346,9 @@
if (this.liftProtocol.getModel()
&& !this.liftProtocol.getRun()
&& this.liftProtocol.getReady()
- && this.liftProtocol.getPakMk()
+// && this.liftProtocol.getPakMk()
&& this.liftProtocol.getErrorCode().equals("0")
- && this.liftProtocol.getProtocolStatus().equals(LiftProtocolStatusType.IDLE)
+ && this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.IDLE)
&& !extend.getLock()
) {
return true;
@@ -403,37 +403,37 @@
//鑾峰彇璁惧鐘舵��
private JSONObject requestDeviceStatus() {
//妯℃嫙鏁版嵁
- String data = "[{\"taskNo\":1244,\"curFloor\":2,\"readyState\":1,\"haveCar\":'N',\"completeTaskNo\":0,\"haveCargo\":\"Y\",\"runningstate\":0,\"floors\":[{\"floor\":1,\"location\":1,\"run\":1,\"error\":1,\"cargoState\":\"Y\"},{\"floor\":1,\"location\":2,\"run\":0,\"error\":0,\"cargoState\":\"N\"}]}]";
- return JSON.parseArray(data).getJSONObject(0);
-// try {
-// String loginToken = requestLoginToken();
-// if (loginToken == null) {
-// return null;
-// }
-//
-// HashMap<String, Object> headers = new HashMap<>();
-// headers.put("Authorization", "Bearer " + loginToken);
-//
-// HashMap<String, Object> param = new HashMap<>();
-// param.put("messageName", "deviceRgvStatus");
-// param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-// param.put("deviceNo", device.getDeviceNo());
-// String response = new HttpHandler.Builder()
-// .setUri(API_URL)
-// .setPath("/RDS/deviceLifterStatus")
-// .setHeaders(headers)
-// .setJson(JSON.toJSONString(param))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// Integer code = jsonObject.getInteger("code");
-// if (code.equals(200)) {
-// return jsonObject.getJSONArray("data").getJSONObject(0);
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return null;
+// String data = "[{\"taskNo\":1244,\"curFloor\":2,\"readyState\":1,\"haveCar\":'N',\"completeTaskNo\":0,\"haveCargo\":\"Y\",\"runningstate\":0,\"floors\":[{\"floor\":1,\"location\":1,\"run\":1,\"error\":1,\"cargoState\":\"Y\"},{\"floor\":1,\"location\":2,\"run\":0,\"error\":0,\"cargoState\":\"N\"}]}]";
+// return JSON.parseArray(data).getJSONObject(0);
+ try {
+ String loginToken = requestLoginToken();
+ if (loginToken == null) {
+ return null;
+ }
+
+ HashMap<String, Object> headers = new HashMap<>();
+ headers.put("Authorization", "Bearer " + loginToken);
+
+ HashMap<String, Object> param = new HashMap<>();
+ param.put("messageName", "deviceRgvStatus");
+ param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ param.put("deviceNo", device.getDeviceNo());
+ String response = new HttpHandler.Builder()
+ .setUri(API_URL)
+ .setPath("/RDS/deviceLifterStatus")
+ .setHeaders(headers)
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return jsonObject.getJSONArray("data").getJSONObject(0);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
//绌鸿浇绉诲姩
--
Gitblit v1.9.1