From 3f820f20b0510f5723b245d76f53f9039f40a7b4 Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Mon, 6 Jan 2025 22:34:02 +0800
Subject: [PATCH] =?UTF-8?q?iot=E6=97=A5=E5=BF=97=E5=92=8C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=91=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/web/controller/app/EqDeviceController.java | 5 +++--
 .../dromara/web/controller/app/EqIotDeviceController.java  | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
index 8c2c7f56f..b8be953cd 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
@@ -284,7 +284,7 @@ public class EqDeviceController extends BaseController {
         String equipmentName = eqEquipmentLogBo.getEquipmentName();
         Integer status = eqEquipmentLogBo.getStatus();
         List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108", "1", "2", "112", "113");
-        if (!statusList.contains(status.toString())) return;
+
         //设备id查询
         DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断
         if (deviceByNameDto==null) throw new RuntimeException("设备不存在");
@@ -321,7 +321,8 @@ public class EqDeviceController extends BaseController {
         eqEquipmentLogBo.setDayOfWeek(dayOfWeek - 1);// Calendar类中星期日为1，星期一为2，依此类推
 
         //更新状态
-        if(!(status==0 ||status==108 ||status==109 ||status==110 ||status==111 ||status==112 ||status==113||status==114||status==500||status==501) )
+        if (statusList.contains(status.toString()) )
+//        if(!(status==0 ||status==108 ||status==109 ||status==110 ||status==111 ||status==112 ||status==113||status==114||status==500||status==501) )
         {
             logService.insertByBo(eqEquipmentLogBo);
         }
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
index 29876e399..9e6bd4bac 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
@@ -141,8 +141,9 @@ public class EqIotDeviceController extends BaseController {
      */
     @SaIgnore
     @PostMapping("/sendDeviceMsg2")
-    public void sendDeviceMsg2(@RequestBody EqEquipmentLogBo eqEquipmentLogBo){
-        String status = eqEquipmentLogBo.getStatus() + "";
+    public void sendDeviceMsg2(@RequestBody EqEquipmentLogBo eqEquipmentLogBo) throws InterruptedException {
+        Thread.sleep(1000);
+        /*String status = eqEquipmentLogBo.getStatus() + "";
         String statusCache = tokenCache.getIfPresent("status");
         if (StringUtils.isEmpty(statusCache)){
             tokenCache.put("status",status);
@@ -152,7 +153,7 @@ public class EqIotDeviceController extends BaseController {
             }else{
                 return;
             }
-        }
+        }*/
         String equipmentName = eqEquipmentLogBo.getEquipmentName();
         //设备id查询
         DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断