发布v1.1版本

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Alert.java

@@ -0,0 +1,137 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备告警对象 iot_alert
+ * 
+ * @author kerwincui
+ * @date 2022-01-13
+ */
+public class Alert extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 告警ID */
+    private Long alertId;
+
+    /** 告警名称 */
+    @Excel(name = "告警名称")
+    private String alertName;
+
+    /** 告警级别（1=提醒通知，2=轻微问题，3=严重警告） */
+    @Excel(name = "告警级别", readConverterExp = "1==提醒通知，2=轻微问题，3=严重警告")
+    private Long alertLevel;
+
+    /** 产品ID */
+    @Excel(name = "产品ID")
+    private Long productId;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 触发器 */
+    @Excel(name = "触发器")
+    private String triggers;
+
+    /** 执行动作 */
+    @Excel(name = "执行动作")
+    private String actions;
+
+    /** 告警状态 （1-启动，2-停止）**/
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setAlertId(Long alertId)
+    {
+        this.alertId = alertId;
+    }
+
+    public Long getAlertId() 
+    {
+        return alertId;
+    }
+    public void setAlertName(String alertName) 
+    {
+        this.alertName = alertName;
+    }
+
+    public String getAlertName() 
+    {
+        return alertName;
+    }
+    public void setAlertLevel(Long alertLevel) 
+    {
+        this.alertLevel = alertLevel;
+    }
+
+    public Long getAlertLevel() 
+    {
+        return alertLevel;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setTriggers(String triggers) 
+    {
+        this.triggers = triggers;
+    }
+
+    public String getTriggers() 
+    {
+        return triggers;
+    }
+    public void setActions(String actions) 
+    {
+        this.actions = actions;
+    }
+
+    public String getActions() 
+    {
+        return actions;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("alertId", getAlertId())
+            .append("alertName", getAlertName())
+            .append("alertLevel", getAlertLevel())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("triggers", getTriggers())
+            .append("actions", getActions())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/AlertLog.java

@@ -0,0 +1,140 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备告警对象 iot_alert_log
+ * 
+ * @author kerwincui
+ * @date 2022-01-13
+ */
+public class AlertLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 告警ID */
+    private Long alertLogId;
+
+    /** 告警名称 */
+    @Excel(name = "告警名称")
+    private String alertName;
+
+    /** 告警级别（1=提醒通知，2=轻微问题，3=严重警告，4=场景联动） */
+    @Excel(name = "告警级别", readConverterExp = "1==提醒通知，2=轻微问题，3=严重警告，4=场景联动")
+    private Long alertLevel;
+
+    /** 处理状态(0=不需要处理,1=未处理,2=已处理) */
+    @Excel(name = "处理状态(0=不需要处理,1=未处理,2=已处理)")
+    private Long status;
+
+    /** 产品ID */
+    @Excel(name = "产品ID")
+    private Long productId;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 设备ID */
+    @Excel(name = "设备ID")
+    private Long deviceId;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    public void setAlertLogId(Long alertLogId) 
+    {
+        this.alertLogId = alertLogId;
+    }
+
+    public Long getAlertLogId() 
+    {
+        return alertLogId;
+    }
+    public void setAlertName(String alertLogName)
+    {
+        this.alertName = alertLogName;
+    }
+
+    public String getAlertName()
+    {
+        return alertName;
+    }
+    public void setAlertLevel(Long alertLevel) 
+    {
+        this.alertLevel = alertLevel;
+    }
+
+    public Long getAlertLevel() 
+    {
+        return alertLevel;
+    }
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("alertLogId", getAlertLogId())
+            .append("alertName", getAlertName())
+            .append("alertLevel", getAlertLevel())
+            .append("status", getStatus())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("deviceId", getDeviceId())
+            .append("deviceName", getDeviceName())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Category.java

@@ -0,0 +1,124 @@
+package com.ruoyi.iot.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 产品分类对象 iot_category
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class Category extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 产品分类ID */
+    private Long categoryId;
+
+    /** 产品分类名称 */
+    @Excel(name = "产品分类名称")
+    private String categoryName;
+
+    /** 租户ID */
+    @Excel(name = "租户ID")
+    private Long tenantId;
+
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String tenantName;
+
+    /** 是否系统通用（0-否，1-是） */
+    @Excel(name = "是否系统通用", readConverterExp = "0=-否，1-是")
+    private Integer isSys;
+
+    /** 显示顺序 */
+    @Excel(name = "显示顺序")
+    private Integer orderNum;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setCategoryId(Long categoryId) 
+    {
+        this.categoryId = categoryId;
+    }
+
+    public Long getCategoryId() 
+    {
+        return categoryId;
+    }
+    public void setCategoryName(String categoryName) 
+    {
+        this.categoryName = categoryName;
+    }
+
+    public String getCategoryName() 
+    {
+        return categoryName;
+    }
+    public void setTenantId(Long tenantId) 
+    {
+        this.tenantId = tenantId;
+    }
+
+    public Long getTenantId() 
+    {
+        return tenantId;
+    }
+    public void setTenantName(String tenantName) 
+    {
+        this.tenantName = tenantName;
+    }
+
+    public String getTenantName() 
+    {
+        return tenantName;
+    }
+    public void setIsSys(Integer isSys) 
+    {
+        this.isSys = isSys;
+    }
+    public Integer getIsSys() 
+    {
+        return isSys;
+    }
+
+    public void setOrderNum(Integer orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("categoryId", getCategoryId())
+            .append("categoryName", getCategoryName())
+            .append("tenantId", getTenantId())
+            .append("tenantName", getTenantName())
+            .append("isSys", getIsSys())
+            .append("orderNum", getOrderNum())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Device.java

@@ -0,0 +1,331 @@
+package com.ruoyi.iot.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 设备对象 iot_device
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class Device extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 产品分类ID */
+    private Long deviceId;
+
+    /** 产品分类名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 产品ID */
+    @Excel(name = "产品ID")
+    private Long productId;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private String userName;
+
+    /** 租户ID */
+    @Excel(name = "租户ID")
+    private Long tenantId;
+
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String tenantName;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String serialNumber;
+
+    /** 固件版本 */
+    @Excel(name = "固件版本")
+    private BigDecimal firmwareVersion;
+
+    /** 设备状态（1-未激活，2-禁用，3-在线，4-离线） */
+    @Excel(name = "设备状态")
+    private Integer status;
+
+    /** wifi信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]） */
+    @Excel(name = "wifi信号强度")
+    private Integer rssi;
+
+    /** 设备影子 */
+    private Integer isShadow;
+
+    /** 设备所在地址 */
+    @Excel(name = "设备所在地址")
+    private String networkAddress;
+
+    /** 设备入网IP */
+    @Excel(name = "设备入网IP")
+    private String networkIp;
+
+    /** 设备经度 */
+    @Excel(name = "设备经度")
+    private BigDecimal longitude;
+
+    /** 设备纬度 */
+    @Excel(name = "设备纬度")
+    private BigDecimal latitude;
+
+    /** 激活时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "激活时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date activeTime;
+
+    @Excel(name = "物模型")
+    private String thingsModelValue;
+
+    /** 图片地址 */
+    private String imgUrl;
+
+    /** 是否自定义位置 **/
+    private Integer isCustomLocation;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public Integer getIsCustomLocation() {
+        return isCustomLocation;
+    }
+
+    public void setIsCustomLocation(Integer isCustomLocation) {
+        this.isCustomLocation = isCustomLocation;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public Integer getIsShadow() {
+        return isShadow;
+    }
+
+    public void setIsShadow(Integer isShadow) {
+        this.isShadow = isShadow;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public void setDeviceId(Long deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setTenantId(Long tenantId) 
+    {
+        this.tenantId = tenantId;
+    }
+
+    public Long getTenantId() 
+    {
+        return tenantId;
+    }
+    public void setTenantName(String tenantName) 
+    {
+        this.tenantName = tenantName;
+    }
+
+    public String getTenantName() 
+    {
+        return tenantName;
+    }
+    public void setSerialNumber(String serialNumber) 
+    {
+        this.serialNumber = serialNumber;
+    }
+
+    public String getSerialNumber() 
+    {
+        return serialNumber;
+    }
+    public void setFirmwareVersion(BigDecimal firmwareVersion) 
+    {
+        this.firmwareVersion = firmwareVersion;
+    }
+
+    public BigDecimal getFirmwareVersion() 
+    {
+        return firmwareVersion;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+    public void setRssi(Integer rssi) 
+    {
+        this.rssi = rssi;
+    }
+
+    public Integer getRssi() 
+    {
+        return rssi;
+    }
+    public void setThingsModelValue(String thingsModelValue)
+    {
+        this.thingsModelValue = thingsModelValue;
+    }
+
+    public String getThingsModelValue()
+    {
+        return thingsModelValue;
+    }
+    public void setNetworkAddress(String networkAddress) 
+    {
+        this.networkAddress = networkAddress;
+    }
+
+    public String getNetworkAddress() 
+    {
+        return networkAddress;
+    }
+    public void setNetworkIp(String networkIp) 
+    {
+        this.networkIp = networkIp;
+    }
+
+    public String getNetworkIp() 
+    {
+        return networkIp;
+    }
+    public void setLongitude(BigDecimal longitude)
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude()
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude)
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude()
+    {
+        return latitude;
+    }
+    public void setActiveTime(Date activeTime) 
+    {
+        this.activeTime = activeTime;
+    }
+
+    public Date getActiveTime() 
+    {
+        return activeTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceId", getDeviceId())
+            .append("deviceName", getDeviceName())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("userId", getUserId())
+            .append("userName", getUserName())
+            .append("tenantId", getTenantId())
+            .append("tenantName", getTenantName())
+            .append("serialNumber", getSerialNumber())
+            .append("firmwareVersion", getFirmwareVersion())
+            .append("status", getStatus())
+            .append("rssi", getRssi())
+            .append("networkAddress", getNetworkAddress())
+            .append("networkIp", getNetworkIp())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("activeTime", getActiveTime())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceGroup.java

@@ -0,0 +1,41 @@
+package com.ruoyi.iot.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备分组对象 iot_device_group
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class DeviceGroup
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 分组ID */
+    private Long groupId;
+
+    /** 设备ID */
+    private Long deviceId;
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public Long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceJob.java

@@ -0,0 +1,276 @@
+package com.ruoyi.iot.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.quartz.util.CronUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+/**
+ * 设备定时任务
+ * 
+ * @author kerwincui
+ */
+public class DeviceJob extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 任务ID */
+    @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
+    private Long jobId;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String jobName;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String serialNumber;
+
+    /** 设备id */
+    private Long deviceId;
+
+    /** 设备名称 */
+    private String deviceName;
+
+    /** 执行动作 */
+    private String actions;
+
+    /** 任务组名 */
+    @Excel(name = "任务组名")
+    private String jobGroup;
+
+    /** cron执行表达式 */
+    @Excel(name = "执行表达式 ")
+    private String cronExpression;
+
+    /** cron计划策略 */
+    @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
+    private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
+
+    /** 是否并发执行（0允许 1禁止） */
+    @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
+    private String concurrent;
+
+    /** 任务状态（0正常 1暂停） */
+    @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
+    private String status;
+
+    /** 是否详细corn表达式 */
+    private Integer isAdvance;
+
+    /** 定时类型（1=设备定时，2=设备告警，3=场景联动） */
+    @Excel(name = "定时类型", readConverterExp = "1==设备定时，2=设备告警，3=场景联动")
+    private Integer jobType;
+
+    /** 产品ID */
+    @Excel(name = "产品ID")
+    private Long productId;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 场景联动ID */
+    @Excel(name = "场景联动ID")
+    private Long sceneId;
+
+    /** 告警ID */
+    @Excel(name = "告警ID")
+    private Long alertId;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public Integer getIsAdvance() {
+        return isAdvance;
+    }
+
+    public void setIsAdvance(Integer isAdvance) {
+        this.isAdvance = isAdvance;
+    }
+
+    public Integer getJobType() {
+        return jobType;
+    }
+
+    public void setJobType(Integer jobType) {
+        this.jobType = jobType;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public Long getSceneId() {
+        return sceneId;
+    }
+
+    public void setSceneId(Long sceneId) {
+        this.sceneId = sceneId;
+    }
+
+    public Long getAlertId() {
+        return alertId;
+    }
+
+    public void setAlertId(Long alertId) {
+        this.alertId = alertId;
+    }
+
+    public Long getJobId()
+    {
+        return jobId;
+    }
+
+    public void setJobId(Long jobId)
+    {
+        this.jobId = jobId;
+    }
+
+    @NotBlank(message = "任务名称不能为空")
+    @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
+    public String getJobName()
+    {
+        return jobName;
+    }
+
+    public void setJobName(String jobName)
+    {
+        this.jobName = jobName;
+    }
+
+    public String getJobGroup()
+    {
+        return jobGroup;
+    }
+
+    public void setJobGroup(String jobGroup)
+    {
+        this.jobGroup = jobGroup;
+    }
+
+    public Long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getActions() {
+        return actions;
+    }
+
+    public void setActions(String actions) {
+        this.actions = actions;
+    }
+
+    @NotBlank(message = "Cron执行表达式不能为空")
+    @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
+    public String getCronExpression()
+    {
+        return cronExpression;
+    }
+
+    public void setCronExpression(String cronExpression)
+    {
+        this.cronExpression = cronExpression;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date getNextValidTime()
+    {
+        if (StringUtils.isNotEmpty(cronExpression))
+        {
+            return CronUtils.getNextExecution(cronExpression);
+        }
+        return null;
+    }
+
+    public String getMisfirePolicy()
+    {
+        return misfirePolicy;
+    }
+
+    public void setMisfirePolicy(String misfirePolicy)
+    {
+        this.misfirePolicy = misfirePolicy;
+    }
+
+    public String getConcurrent()
+    {
+        return concurrent;
+    }
+
+    public void setConcurrent(String concurrent)
+    {
+        this.concurrent = concurrent;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("jobName", getJobName())
+            .append("jobGroup", getJobGroup())
+            .append("cronExpression", getCronExpression())
+            .append("nextValidTime", getNextValidTime())
+            .append("misfirePolicy", getMisfirePolicy())
+            .append("concurrent", getConcurrent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceLog.java

@@ -0,0 +1,137 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备日志对象 iot_device_log
+ * 
+ * @author kerwincui
+ * @date 2022-01-13
+ */
+public class DeviceLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备日志ID */
+    private Long logId;
+
+    /** 类型（1=属性上报，2=事件上报，3=调用功能，4=设备升级，5=设备上线，6=设备离线） */
+    @Excel(name = "类型", readConverterExp = "1==属性上报，2=事件上报，3=调用功能，4=设备升级，5=设备上线，6=设备离线")
+    private Integer logType;
+
+    /** 日志值 */
+    @Excel(name = "日志值")
+    private String logValue;
+
+    /** 设备ID */
+    @Excel(name = "设备ID")
+    private Long deviceId;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String serialNumber;
+
+    /** 标识符 */
+    @Excel(name = "标识符")
+    private String identity;
+
+    /** 是否监测数据（1=是，0=否） */
+    @Excel(name = "是否监测数据", readConverterExp = "1==是，0=否")
+    private Integer isMonitor;
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public void setLogId(Long logId)
+    {
+        this.logId = logId;
+    }
+
+    public Long getLogId() 
+    {
+        return logId;
+    }
+
+    public void setLogType(Integer logType) 
+    {
+        this.logType = logType;
+    }
+
+    public Integer getLogType() 
+    {
+        return logType;
+    }
+    public void setLogValue(String logValue) 
+    {
+        this.logValue = logValue;
+    }
+
+    public String getLogValue() 
+    {
+        return logValue;
+    }
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setIdentity(String identity) 
+    {
+        this.identity = identity;
+    }
+
+    public String getIdentity() 
+    {
+        return identity;
+    }
+    public void setIsMonitor(Integer isMonitor) 
+    {
+        this.isMonitor = isMonitor;
+    }
+
+    public Integer getIsMonitor() 
+    {
+        return isMonitor;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("logId", getLogId())
+            .append("logType", getLogType())
+            .append("logValue", getLogValue())
+            .append("deviceId", getDeviceId())
+            .append("deviceName", getDeviceName())
+            .append("identity", getIdentity())
+            .append("createBy", getCreateBy())
+            .append("isMonitor", getIsMonitor())
+            .append("createTime", getCreateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceUser.java

@@ -0,0 +1,143 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备用户对象 iot_device_user
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class DeviceUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 固件ID */
+    private Long deviceId;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private String userName;
+
+    /** 是否为设备所有者 */
+    @Excel(name = "是否为设备所有者")
+    private Integer isOwner;
+
+    /** 租户ID */
+    private Long tenantId;
+
+    /** 租户名称 */
+    private String tenantName;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public void setDeviceId(Long deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setIsOwner(Integer isOwner)
+    {
+        this.isOwner = isOwner;
+    }
+
+    public Integer getIsOwner()
+    {
+        return isOwner;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceId", getDeviceId())
+            .append("userId", getUserId())
+            .append("deviceName", getDeviceName())
+            .append("userName", getUserName())
+            .append("isOwner", getIsOwner())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Firmware.java

@@ -0,0 +1,168 @@
+package com.ruoyi.iot.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 产品固件对象 iot_firmware
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class Firmware extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 固件ID */
+    private Long firmwareId;
+
+    /** 固件名称 */
+    @Excel(name = "固件名称")
+    private String firmwareName;
+
+    /** 产品ID */
+    @Excel(name = "产品ID")
+    private Long productId;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 租户ID */
+    @Excel(name = "租户ID")
+    private Long tenantId;
+
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String tenantName;
+
+    /** 是否系统通用（0-否，1-是） */
+    @Excel(name = "是否系统通用", readConverterExp = "0=-否，1-是")
+    private Integer isSys;
+
+    /** 固件版本 */
+    @Excel(name = "固件版本")
+    private BigDecimal version;
+
+    /** 文件路径 */
+    @Excel(name = "文件路径")
+    private String filePath;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setFirmwareId(Long firmwareId) 
+    {
+        this.firmwareId = firmwareId;
+    }
+
+    public Long getFirmwareId() 
+    {
+        return firmwareId;
+    }
+    public void setFirmwareName(String firmwareName) 
+    {
+        this.firmwareName = firmwareName;
+    }
+
+    public String getFirmwareName() 
+    {
+        return firmwareName;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setTenantId(Long tenantId) 
+    {
+        this.tenantId = tenantId;
+    }
+
+    public Long getTenantId() 
+    {
+        return tenantId;
+    }
+    public void setTenantName(String tenantName) 
+    {
+        this.tenantName = tenantName;
+    }
+
+    public String getTenantName() 
+    {
+        return tenantName;
+    }
+    public void setIsSys(Integer isSys) 
+    {
+        this.isSys = isSys;
+    }
+
+    public Integer getIsSys() 
+    {
+        return isSys;
+    }
+    public void setVersion(BigDecimal version) 
+    {
+        this.version = version;
+    }
+
+    public BigDecimal getVersion() 
+    {
+        return version;
+    }
+    public void setFilePath(String filePath) 
+    {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath() 
+    {
+        return filePath;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("firmwareId", getFirmwareId())
+            .append("firmwareName", getFirmwareName())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("tenantId", getTenantId())
+            .append("tenantName", getTenantName())
+            .append("isSys", getIsSys())
+            .append("version", getVersion())
+            .append("filePath", getFilePath())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Group.java

@@ -0,0 +1,111 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备分组对象 iot_group
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class Group extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 分组ID */
+    private Long groupId;
+
+    /** 分组名称 */
+    @Excel(name = "分组名称")
+    private String groupName;
+
+    /** 分组排序 */
+    @Excel(name = "分组排序")
+    private Long groupOrder;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private String userName;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setGroupName(String groupName) 
+    {
+        this.groupName = groupName;
+    }
+
+    public String getGroupName() 
+    {
+        return groupName;
+    }
+    public void setGroupOrder(Long groupOrder) 
+    {
+        this.groupOrder = groupOrder;
+    }
+
+    public Long getGroupOrder() 
+    {
+        return groupOrder;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("groupId", getGroupId())
+            .append("groupName", getGroupName())
+            .append("groupOrder", getGroupOrder())
+            .append("userId", getUserId())
+            .append("userName", getUserName())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/OauthClientDetails.java

@@ -0,0 +1,191 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 云云对接对象 oauth_client_details
+ * 
+ * @author kerwincui
+ * @date 2022-02-07
+ */
+public class OauthClientDetails extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 客户端ID */
+    @Excel(name = "客户端ID")
+    private String clientId;
+
+    /** 资源 */
+    @Excel(name = "资源")
+    private String resourceIds;
+
+    /** 客户端秘钥 */
+    private String clientSecret;
+
+    /** 权限范围 */
+    @Excel(name = "权限范围")
+    private String scope;
+
+    /** 授权模式 */
+    @Excel(name = "授权模式")
+    private String authorizedGrantTypes;
+
+    /** 回调地址 */
+    @Excel(name = "回调地址")
+    private String webServerRedirectUri;
+
+    /** 权限 */
+    @Excel(name = "权限")
+    private String authorities;
+
+    /** access token有效时间 */
+    @Excel(name = "access token有效时间")
+    private Long accessTokenValidity;
+
+    /** refresh token有效时间 */
+    @Excel(name = "refresh token有效时间")
+    private Long refreshTokenValidity;
+
+    /** 预留的字段 */
+    @Excel(name = "预留的字段")
+    private String additionalInformation;
+
+    /** 自动授权 */
+    @Excel(name = "自动授权")
+    private String autoapprove;
+
+    /** 平台 */
+    @Excel(name = "平台")
+    private Integer type;
+
+    public void setClientId(String clientId) 
+    {
+        this.clientId = clientId;
+    }
+
+    public String getClientId() 
+    {
+        return clientId;
+    }
+    public void setResourceIds(String resourceIds) 
+    {
+        this.resourceIds = resourceIds;
+    }
+
+    public String getResourceIds() 
+    {
+        return resourceIds;
+    }
+    public void setClientSecret(String clientSecret) 
+    {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getClientSecret() 
+    {
+        return clientSecret;
+    }
+    public void setScope(String scope) 
+    {
+        this.scope = scope;
+    }
+
+    public String getScope() 
+    {
+        return scope;
+    }
+    public void setAuthorizedGrantTypes(String authorizedGrantTypes) 
+    {
+        this.authorizedGrantTypes = authorizedGrantTypes;
+    }
+
+    public String getAuthorizedGrantTypes() 
+    {
+        return authorizedGrantTypes;
+    }
+    public void setWebServerRedirectUri(String webServerRedirectUri) 
+    {
+        this.webServerRedirectUri = webServerRedirectUri;
+    }
+
+    public String getWebServerRedirectUri() 
+    {
+        return webServerRedirectUri;
+    }
+    public void setAuthorities(String authorities) 
+    {
+        this.authorities = authorities;
+    }
+
+    public String getAuthorities() 
+    {
+        return authorities;
+    }
+    public void setAccessTokenValidity(Long accessTokenValidity) 
+    {
+        this.accessTokenValidity = accessTokenValidity;
+    }
+
+    public Long getAccessTokenValidity() 
+    {
+        return accessTokenValidity;
+    }
+    public void setRefreshTokenValidity(Long refreshTokenValidity) 
+    {
+        this.refreshTokenValidity = refreshTokenValidity;
+    }
+
+    public Long getRefreshTokenValidity() 
+    {
+        return refreshTokenValidity;
+    }
+    public void setAdditionalInformation(String additionalInformation) 
+    {
+        this.additionalInformation = additionalInformation;
+    }
+
+    public String getAdditionalInformation() 
+    {
+        return additionalInformation;
+    }
+    public void setAutoapprove(String autoapprove) 
+    {
+        this.autoapprove = autoapprove;
+    }
+
+    public String getAutoapprove() 
+    {
+        return autoapprove;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("clientId", getClientId())
+            .append("resourceIds", getResourceIds())
+            .append("clientSecret", getClientSecret())
+            .append("scope", getScope())
+            .append("authorizedGrantTypes", getAuthorizedGrantTypes())
+            .append("webServerRedirectUri", getWebServerRedirectUri())
+            .append("authorities", getAuthorities())
+            .append("accessTokenValidity", getAccessTokenValidity())
+            .append("refreshTokenValidity", getRefreshTokenValidity())
+            .append("additionalInformation", getAdditionalInformation())
+            .append("autoapprove", getAutoapprove())
+            .append("type", getType())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Product.java

@@ -0,0 +1,253 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 产品对象 iot_product
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class Product extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 产品ID */
+    private Long productId;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 产品分类ID */
+    @Excel(name = "产品分类ID")
+    private Long categoryId;
+
+    /** 产品分类名称 */
+    @Excel(name = "产品分类名称")
+    private String categoryName;
+
+    /** 租户ID */
+    @Excel(name = "租户ID")
+    private Long tenantId;
+
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String tenantName;
+
+    /** 是否系统通用（0-否，1-是） */
+    @Excel(name = "是否系统通用", readConverterExp = "0=-否，1-是")
+    private Integer isSys;
+
+    /** mqtt账号 */
+    private String mqttAccount;
+
+    /** mqtt密码 */
+    private String mqttPassword;
+
+    /** 产品秘钥 */
+    private String mqttSecret;
+
+    public String getMqttSecret() {
+        return mqttSecret;
+    }
+
+    public void setMqttSecret(String mqttSecret) {
+        this.mqttSecret = mqttSecret;
+    }
+
+    /** 状态（1-未发布，2-已发布，不能修改） */
+    @Excel(name = "状态", readConverterExp = "1=-未发布，2-已发布，不能修改")
+    private Integer status;
+
+    /** 设备类型（1-直连设备、2-网关子设备、3-网关设备） */
+    @Excel(name = "设备类型", readConverterExp = "1=-直连设备、2-网关子设备、3-网关设备")
+    private Integer deviceType;
+
+    /** 联网方式（1-wifi、2-蓝牙、3-wifi+蓝牙） */
+    @Excel(name = "联网方式", readConverterExp = "1=-wifi、2-蓝牙、3-wifi+蓝牙")
+    private Integer networkMethod;
+
+    /** 认证方式（1-账号密码、2-证书、3-Http） */
+    @Excel(name = "认证方式", readConverterExp = "1=-账号密码、2-证书、3-Http")
+    private Integer vertificateMethod;
+
+    /** 图片地址 */
+    private String imgUrl;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 物模型Json **/
+    private String thingsModelsJson;
+
+    public String getThingsModelsJson() {
+        return thingsModelsJson;
+    }
+
+    public void setThingsModelsJson(String thingsModelsJson) {
+        this.thingsModelsJson = thingsModelsJson;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public void setProductId(Long productId)
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setCategoryId(Long categoryId) 
+    {
+        this.categoryId = categoryId;
+    }
+
+    public Long getCategoryId() 
+    {
+        return categoryId;
+    }
+    public void setCategoryName(String categoryName) 
+    {
+        this.categoryName = categoryName;
+    }
+
+    public String getCategoryName() 
+    {
+        return categoryName;
+    }
+    public void setTenantId(Long tenantId) 
+    {
+        this.tenantId = tenantId;
+    }
+
+    public Long getTenantId() 
+    {
+        return tenantId;
+    }
+
+    public void setTenantName(String tenantName) 
+    {
+        this.tenantName = tenantName;
+    }
+    public String getTenantName() 
+    {
+        return tenantName;
+    }
+
+    public void setIsSys(Integer isSys) 
+    {
+        this.isSys = isSys;
+    }
+    public Integer getIsSys() 
+    {
+        return isSys;
+    }
+
+    public void setMqttAccount(String mqttAccount)
+    {
+        this.mqttAccount = mqttAccount;
+    }
+    public String getMqttAccount()
+    {
+        return mqttAccount;
+    }
+
+    public void setMqttPassword(String mqttPassword)
+    {
+        this.mqttPassword = mqttPassword;
+    }
+    public String getMqttPassword()
+    {
+        return mqttPassword;
+    }
+
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+    public void setDeviceType(Integer deviceType) 
+    {
+        this.deviceType = deviceType;
+    }
+
+    public Integer getDeviceType() 
+    {
+        return deviceType;
+    }
+    public void setNetworkMethod(Integer networkMethod) 
+    {
+        this.networkMethod = networkMethod;
+    }
+
+    public Integer getNetworkMethod() 
+    {
+        return networkMethod;
+    }
+    public void setVertificateMethod(Integer vertificateMethod) 
+    {
+        this.vertificateMethod = vertificateMethod;
+    }
+
+    public Integer getVertificateMethod() 
+    {
+        return vertificateMethod;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("categoryId", getCategoryId())
+            .append("categoryName", getCategoryName())
+            .append("tenantId", getTenantId())
+            .append("tenantName", getTenantName())
+            .append("isSys", getIsSys())
+            .append("status", getStatus())
+            .append("deviceType", getDeviceType())
+            .append("networkMethod", getNetworkMethod())
+            .append("vertificateMethod", getVertificateMethod())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Scene.java

@@ -0,0 +1,112 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 场景联动对象 iot_scene
+ * 
+ * @author kerwincui
+ * @date 2022-01-13
+ */
+public class Scene extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 场景ID */
+    private Long sceneId;
+
+    /** 场景名称 */
+    @Excel(name = "场景名称")
+    private String sceneName;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 触发器 */
+    @Excel(name = "触发器")
+    private String triggers;
+
+    /** 执行动作 */
+    @Excel(name = "执行动作")
+    private String actions;
+
+    public void setSceneId(Long sceneId) 
+    {
+        this.sceneId = sceneId;
+    }
+
+    public Long getSceneId() 
+    {
+        return sceneId;
+    }
+    public void setSceneName(String sceneName) 
+    {
+        this.sceneName = sceneName;
+    }
+
+    public String getSceneName() 
+    {
+        return sceneName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setTriggers(String triggers) 
+    {
+        this.triggers = triggers;
+    }
+
+    public String getTriggers() 
+    {
+        return triggers;
+    }
+    public void setActions(String actions) 
+    {
+        this.actions = actions;
+    }
+
+    public String getActions() 
+    {
+        return actions;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("sceneId", getSceneId())
+            .append("sceneName", getSceneName())
+            .append("userId", getUserId())
+            .append("userName", getUserName())
+            .append("triggers", getTriggers())
+            .append("actions", getActions())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/ThingsModel.java

@@ -0,0 +1,196 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 物模型对象 iot_things_model
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class ThingsModel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 物模型ID */
+    private Long modelId;
+
+    /** 物模型名称 */
+    @Excel(name = "物模型名称")
+    private String modelName;
+
+    /** 产品ID */
+    @Excel(name = "产品ID")
+    private Long productId;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 租户ID */
+    @Excel(name = "租户ID")
+    private Long tenantId;
+
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String tenantName;
+
+    /** 标识符，产品下唯一 */
+    @Excel(name = "标识符，产品下唯一")
+    private String identifier;
+
+    /** 模型类别（1-属性，2-功能，3-事件） */
+    @Excel(name = "模型类别", readConverterExp = "1=-属性，2-功能，3-事件，4-属性和功能")
+    private Integer type;
+
+    /** 数据类型（integer、decimal、string、bool、array、enum） */
+    @Excel(name = "数据类型", readConverterExp = "i=nteger、decimal、string、bool、array、enum")
+    private String datatype;
+
+    /** 数据定义 */
+    @Excel(name = "数据定义")
+    private String specs;
+
+    /** 是否首页显示（0-否，1-是） */
+    @Excel(name = "是否首页显示", readConverterExp = "0=-否，1-是")
+    private Integer isTop;
+
+    /** 是否实时监测（0-否，1-是） */
+    @Excel(name = "是否实时监测", readConverterExp = "0=-否，1-是")
+    private Integer isMonitor;
+
+    public void setModelId(Long modelId) 
+    {
+        this.modelId = modelId;
+    }
+
+    public Long getModelId() 
+    {
+        return modelId;
+    }
+    public void setModelName(String modelName) 
+    {
+        this.modelName = modelName;
+    }
+
+    public String getModelName() 
+    {
+        return modelName;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setTenantId(Long tenantId) 
+    {
+        this.tenantId = tenantId;
+    }
+
+    public Long getTenantId() 
+    {
+        return tenantId;
+    }
+    public void setTenantName(String tenantName) 
+    {
+        this.tenantName = tenantName;
+    }
+
+    public String getTenantName() 
+    {
+        return tenantName;
+    }
+    public void setIdentifier(String identifier) 
+    {
+        this.identifier = identifier;
+    }
+
+    public String getIdentifier() 
+    {
+        return identifier;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+    public void setDatatype(String datatype) 
+    {
+        this.datatype = datatype;
+    }
+
+    public String getDatatype() 
+    {
+        return datatype;
+    }
+    public void setSpecs(String specs) 
+    {
+        this.specs = specs;
+    }
+
+    public String getSpecs() 
+    {
+        return specs;
+    }
+    public void setIsTop(Integer isTop) 
+    {
+        this.isTop = isTop;
+    }
+
+    public Integer getIsTop() 
+    {
+        return isTop;
+    }
+    public void setIsMonitor(Integer isMonitor) 
+    {
+        this.isMonitor = isMonitor;
+    }
+
+    public Integer getIsMonitor() 
+    {
+        return isMonitor;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("modelId", getModelId())
+            .append("modelName", getModelName())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("tenantId", getTenantId())
+            .append("tenantName", getTenantName())
+            .append("identifier", getIdentifier())
+            .append("type", getType())
+            .append("datatype", getDatatype())
+            .append("specs", getSpecs())
+            .append("isTop", getIsTop())
+            .append("isMonitor", getIsMonitor())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/ThingsModelTemplate.java

@@ -0,0 +1,195 @@
+package com.ruoyi.iot.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 通用物模型对象 iot_things_model_template
+ * 
+ * @author kerwincui
+ * @date 2021-12-16
+ */
+public class ThingsModelTemplate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 物模型ID */
+    private Long templateId;
+
+    /** 物模型名称 */
+    @Excel(name = "物模型名称")
+    private String templateName;
+
+    /** 租户ID */
+    @Excel(name = "租户ID")
+    private Long tenantId;
+
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String tenantName;
+
+    /** 标识符，产品下唯一 */
+    @Excel(name = "标识符")
+    private String identifier;
+
+    /** 模型类别（1-属性，2-功能，3-事件） */
+    @Excel(name = "模型类别", dictType = "iot_things_type")
+    private Integer type;
+
+    /** 数据类型（integer、decimal、string、bool、array、enum） */
+    @Excel(name = "数据类型")
+    private String datatype;
+
+    /** 数据定义 */
+    @Excel(name = "数据定义")
+    private String specs;
+
+    /** 是否系统通用（0-否，1-是） */
+    @Excel(name = "是否系统通用", dictType = "iot_yes_no")
+    private Integer isSys;
+
+    /** 是否首页显示（0-否，1-是） */
+    @Excel(name = "是否首页显示", dictType = "iot_yes_no")
+    private Integer isTop;
+
+    /** 是否实时监测（0-否，1-是） */
+    @Excel(name = "是否实时监测", dictType = "iot_yes_no")
+    private Integer isMonitor;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setTemplateId(Long templateId) 
+    {
+        this.templateId = templateId;
+    }
+
+    public Long getTemplateId() 
+    {
+        return templateId;
+    }
+    public void setTemplateName(String templateName) 
+    {
+        this.templateName = templateName;
+    }
+
+    public String getTemplateName() 
+    {
+        return templateName;
+    }
+    public void setTenantId(Long tenantId) 
+    {
+        this.tenantId = tenantId;
+    }
+
+    public Long getTenantId() 
+    {
+        return tenantId;
+    }
+    public void setTenantName(String tenantName) 
+    {
+        this.tenantName = tenantName;
+    }
+
+    public String getTenantName() 
+    {
+        return tenantName;
+    }
+    public void setIdentifier(String identifier) 
+    {
+        this.identifier = identifier;
+    }
+
+    public String getIdentifier() 
+    {
+        return identifier;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+    public void setDatatype(String datatype) 
+    {
+        this.datatype = datatype;
+    }
+
+    public String getDatatype() 
+    {
+        return datatype;
+    }
+    public void setSpecs(String specs) 
+    {
+        this.specs = specs;
+    }
+
+    public String getSpecs() 
+    {
+        return specs;
+    }
+    public void setIsSys(Integer isSys) 
+    {
+        this.isSys = isSys;
+    }
+
+    public Integer getIsSys() 
+    {
+        return isSys;
+    }
+    public void setIsTop(Integer isTop) 
+    {
+        this.isTop = isTop;
+    }
+
+    public Integer getIsTop() 
+    {
+        return isTop;
+    }
+    public void setIsMonitor(Integer isMonitor) 
+    {
+        this.isMonitor = isMonitor;
+    }
+
+    public Integer getIsMonitor() 
+    {
+        return isMonitor;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("templateId", getTemplateId())
+            .append("templateName", getTemplateName())
+            .append("tenantId", getTenantId())
+            .append("tenantName", getTenantName())
+            .append("identifier", getIdentifier())
+            .append("type", getType())
+            .append("datatype", getDatatype())
+            .append("specs", getSpecs())
+            .append("isSys", getIsSys())
+            .append("isTop", getIsTop())
+            .append("isMonitor", getIsMonitor())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}