From c461b8c84187de2ce795d5ccfdb535bb4e835c1b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 12 九月 2024 14:41:16 +0800
Subject: [PATCH] #速锐登录增加缓存

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
index aa9bc31..d2e9445 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -132,7 +132,7 @@
                 //褰撳墠浜岀淮鐮�
                 shuttleProtocol.setCurrentCode(data.getString("groundCode") == null ? "0" : data.getString("groundCode"));
                 //鐢垫睜鐢甸噺
-                shuttleProtocol.setBatteryPower(data.getString("battery") == null ? "0%" : data.getString("battery"));
+                shuttleProtocol.setBatteryPower(data.getString("battery") == null ? "0" : data.getString("battery"));
                 //鏁呴殰
                 shuttleProtocol.setErrorCode(deviceStatus == 6 ? "1" : "0");
 
@@ -786,6 +786,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");
@@ -799,7 +804,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