From 16dbd0a1d419404a955b3332b26de38ca9a7da3b Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Mon, 18 Sep 2023 19:30:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/qiuguo/iot/base/enums/DeviceTypeEnum.java | 2 +- .../qiuguo/iot/data/entity/device/DeviceUserBindEntity.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/DeviceTypeEnum.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/DeviceTypeEnum.java index 8ec8add..a2d4f17 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/DeviceTypeEnum.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/DeviceTypeEnum.java @@ -11,7 +11,7 @@ package com.qiuguo.iot.base.enums; // 1000秋果box android配置App 1001秋果Box iOS配置App public enum DeviceTypeEnum { GUO_BOX(0, "果box", "BOX"), - ELECTRIC_SOCKET(1, "智能插座", "SOC"), + ELECTRIC_SOCKET(1, "涂鸦设备", "tuya"), BIG_LIGHT(2, "智能大灯", "BIL"), CURTAIN_DRIVE(3, "智能窗帘驱动", "CUR"), WINDOW_DRIVE(4, "智能窗户关闭", "WIN"), diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/entity/device/DeviceUserBindEntity.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/entity/device/DeviceUserBindEntity.java index 0daab13..96b86a7 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/entity/device/DeviceUserBindEntity.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/entity/device/DeviceUserBindEntity.java @@ -40,6 +40,10 @@ public class DeviceUserBindEntity extends GenericEntity { @Comment("设备id") @Column(name = "device_id", nullable = false) private Long deviceId; + + @Comment("三方设备id") + @Column(name = "other_device_id", nullable = true) + private String otherDeviceId; @Comment("设备类型：0 果Box 1智能插座 2智能大灯 3智能窗帘驱动 4智能窗户关闭 5智能台灯 6智能桌子 7智能椅子 8智能风扇 9智能空调（遥控器） 10智能冰箱 11智能洗碗机 12智能电热水器 13温度传感器 14空气质量传感器 15光线传感器 16雨量传感器 17闭门器") @Column(name = "device_type", nullable = false)