From 11585da7f567038741552e6abbb926419696f21b Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Tue, 9 Jul 2024 13:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/yunxi/controller/DeviceController.java     | 10 ++++------
 .../main/java/cc/yunxi/domain/vo/device/CMDEnum.java   |  2 +-
 .../main/java/cc/yunxi/domain/vo/device/WeightVO.java  |  1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
index 032eed5..d9cee19 100644
--- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
+++ b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
@@ -615,9 +615,8 @@ public class DeviceController {
         if (null == device1) {
             return CommonResult.error(400, "设备编码编码不正确，命令不能下发！");
         }
-        Object value = redisTool.getValue("online_" + deviceCode);
-        long expire = redisTool.getKeyExpire("online_" + deviceCode, TimeUnit.SECONDS);
-        if (value == null || expire <= 0) {
+        boolean exist = redisTool.existsKey("online_" + deviceCode);
+        if (!exist) {
             return CommonResult.error(400, "设备不在线，命令不能下发！");
         }
 //        Object value = redisTool.getValue(deviceCode);
@@ -813,7 +812,7 @@ public class DeviceController {
 //
 //        }
         String key = "weight_" + weight.getDeviceCode() + "_" + weight.getBucketCode();
-        redisTool.setValue(key, JSONUtil.toJsonStr(weight), 1000 * 60L);//一分钟过期
+        redisTool.setValue(key, JSONUtil.toJsonStr(weight), 1000L * 60 * 3);//3分钟过期
         return CommonResult.success("success");
     }
 
@@ -821,9 +820,8 @@ public class DeviceController {
     @PostMapping("/getWeight")
     public CommonResult<WeightVO> getWeight(@RequestBody DeviceBucketVO deviceBucketVO) {
         String key = "weight_" + deviceBucketVO.getDeviceCode() + "_" + deviceBucketVO.getBucketCode();
-        long expire = redisTool.getKeyExpire(key, TimeUnit.SECONDS);
         boolean exist = redisTool.existsKey(key);
-        if (!exist || expire <= 0) {
+        if (!exist) {
             return CommonResult.error(400, "获取实时重量失败");
         }
         Object value = redisTool.getValue(key);
diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CMDEnum.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CMDEnum.java
index bbab1ad..7b135e0 100644
--- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CMDEnum.java
+++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CMDEnum.java
@@ -14,7 +14,7 @@ public enum CMDEnum {
     apply("apply", "申请控制"),
     exit("exit", "结束控制"),
     weight("weight", "获取重量"),
-    change("change", "配置更新"),
+    refresh("refresh", "配置更新"),
     reboot("reboot", "重启设备"),
     restart("restart", "重启应用"),
     update("update", "更新应用"),
diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/WeightVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/WeightVO.java
index ea459c8..f06ed11 100644
--- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/WeightVO.java
+++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/WeightVO.java
@@ -9,7 +9,6 @@ import java.math.BigDecimal;
 @Data
 @ApiModel("实时重量")
 public class WeightVO {
-
     @ApiModelProperty(value = "设备编码", required = true)
     private String deviceCode;
     @ApiModelProperty(value = "桶编码", required = true)