From f685093ecae3c72c91a0e1173ef2f56b28cff27a Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Tue, 5 Jul 2022 01:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E5=B8=83=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=9A=84=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/iot/service/impl/DeviceServiceImpl.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
index 3ab28aa3..34181f28 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
@@ -14,6 +14,7 @@ import com.ruoyi.iot.domain.Device;
 import com.ruoyi.iot.domain.DeviceLog;
 import com.ruoyi.iot.domain.DeviceUser;
 import com.ruoyi.iot.domain.Product;
+import com.ruoyi.iot.mqtt.EmqxService;
 import com.ruoyi.iot.tdengine.service.ILogService;
 import com.ruoyi.iot.mapper.DeviceLogMapper;
 import com.ruoyi.iot.mapper.DeviceMapper;
@@ -30,6 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +81,10 @@ public class DeviceServiceImpl implements IDeviceService {
     @Autowired
     private ILogService logService;
 
+    @Autowired
+    @Lazy
+    private EmqxService emqxService;
+
     /**
      * 查询设备
      *
@@ -703,6 +709,11 @@ public class DeviceServiceImpl implements IDeviceService {
             device.setProductName(null);
         }
         deviceMapper.updateDevice(device);
+        // 设备取消禁用
+        if(oldDevice.getStatus()==2 && device.getStatus()==4){
+            // 发布设备信息
+            emqxService.publishInfo(oldDevice.getProductId(),oldDevice.getSerialNumber());
+        }
         return AjaxResult.success("修改成功",1);
     }