From 4e13489366b31b3641ca37e9c41ec5f4ae41958c Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: Wed, 25 May 2022 13:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=B3=A8=E5=86=8C=E8=8E=B7=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=92=8C=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../genersoft/iot/vmp/service/impl/DeviceServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 0144e83b..e4a2a19c 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -77,13 +77,15 @@ public class DeviceServiceImpl implements IDeviceService {
         if (device.getCreateTime() == null) {
             device.setCreateTime(now);
             logger.info("[设备上线,首次注册]: {}，查询设备信息以及通道信息", device.getDeviceId());
+            deviceMapper.add(device);
+            redisCatchStorage.updateDevice(device);
             commander.deviceInfoQuery(device);
             sync(device);
-            deviceMapper.add(device);
         }else {
             deviceMapper.update(device);
+            redisCatchStorage.updateDevice(device);
         }
-        redisCatchStorage.updateDevice(device);
+
         // 上线添加订阅
         if (device.getSubscribeCycleForCatalog() > 0) {
             // 查询在线设备那些开启了订阅，为设备开启定时的目录订阅