From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
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 ae8097c..87c894a 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
@@ -16,6 +16,7 @@
import com.zy.asrs.wcs.core.service.BasLiftService;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
+import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.rcs.entity.DeviceDataLog;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
@@ -92,8 +93,13 @@
//----------璇诲彇鎻愬崌鏈虹姸鎬�-----------
//妯″紡
liftProtocol.setModel(true);
+
+ boolean runningState = data.getInteger("runningState") == 1;
+ if (!data.getInteger("completeTaskNo").equals(data.getInteger("taskNo"))) {
+ runningState = true;//宸ヤ綔鍙蜂笉涓�鑷达紝璁や负澶勪簬杩愯涓�
+ }
//杩愯鐘舵��
- liftProtocol.setRun(data.getInteger("runningState") == 1);
+ liftProtocol.setRun(runningState);
//灏辩华鐘舵��
liftProtocol.setReady(data.getInteger("readyState") == 1);
//鏈夋墭鐩�
@@ -483,6 +489,11 @@
//璇锋眰鐧诲綍
private String requestLoginToken() {
try {
+ Object redisToken = redisUtil.get(DeviceRedisConstant.RDS_LOGIN_TOKEN);
+ if(redisToken != null) {
+ return redisToken.toString();
+ }
+
HashMap<String, Object> param = new HashMap<>();
param.put("username", "admin");
param.put("password", "admin123");
@@ -496,7 +507,9 @@
JSONObject jsonObject = JSON.parseObject(response);
Integer code = jsonObject.getInteger("code");
if (code.equals(200)) {
- return jsonObject.getString("token");
+ String token = jsonObject.getString("token");
+ redisUtil.set(DeviceRedisConstant.RDS_LOGIN_TOKEN, token, 60 * 15);
+ return token;
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1