From 7e4e7292ce42505a94f6d39767a0ac256f921d05 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Wed, 27 Jul 2022 19:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=BB=98=E8=AE=A4=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=90=8D=E7=A7=B0=E5=8A=A0=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 0d4db7cb..574ca886 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
@@ -620,15 +620,13 @@ public class DeviceServiceImpl implements IDeviceService {
             return 0;
         }
         Device device = new Device();
-        int random = (int) (Math.random() * (9000)) + 1000;
-        device.setDeviceName("设备" + random);
         device.setSerialNumber(serialNumber);
         SysUser user = userService.selectUserById(userId);
         device.setUserId(userId);
         device.setUserName(user.getUserName());
         device.setFirmwareVersion(BigDecimal.valueOf(1.0));
         // 设备状态（1-未激活，2-禁用，3-在线，4-离线）
-        device.setStatus(3);
+        device.setStatus(1);
         device.setActiveTime(DateUtils.getNowDate());
         device.setIsShadow(0);
         device.setRssi(0);
@@ -647,6 +645,8 @@ public class DeviceServiceImpl implements IDeviceService {
             log.error("自动添加设备时，根据产品ID查找不到对应产品");
             return 0;
         }
+        int random = (int) (Math.random() * (90)) + 10;
+        device.setDeviceName(product.getProductName() + random);
         device.setTenantId(product.getTenantId());
         device.setTenantName(product.getTenantName());
         device.setImgUrl(product.getImgUrl());