后端功能完善

spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/domain/IotDeviceSet.java

@@ -46,6 +46,18 @@ public class IotDeviceSet extends BaseEntity
     @Excel(name = "打开AP")
     private Integer isAp;
 
+    /** 是否离线使用 */
+    @Excel(name = "是否离线使用")
+    private Integer isWifiOffline;
+
+    /** 是否使用证书 */
+    @Excel(name = "是否使用证书")
+    private Integer isOpenCertifi;
+
+    /** 智能配网 */
+    @Excel(name = "智能配网")
+    private Integer isSmartConfig;
+
     /** 射频遥控 */
     @Excel(name = "射频遥控")
     private Integer isRfControl;
@@ -86,6 +98,10 @@ public class IotDeviceSet extends BaseEntity
     @Excel(name = "配网IP")
     private String networkIp;
 
+    /** 雷达感应间隔 */
+    @Excel(name = "雷达感应间隔")
+    private Integer radarInterval;
+
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
@@ -152,15 +168,43 @@ public class IotDeviceSet extends BaseEntity
     {
         return isReset;
     }
+
     public void setIsAp(Integer isAp) 
     {
         this.isAp = isAp;
     }
-
     public Integer getIsAp() 
     {
         return isAp;
     }
+
+    public void setIsWifiOffline(Integer isWifiOffline)
+    {
+        this.isWifiOffline = isWifiOffline;
+    }
+    public Integer getIsWifiOffline()
+    {
+        return isWifiOffline;
+    }
+
+    public void setIsOpenCertifi(Integer isOpenCertifi)
+    {
+        this.isOpenCertifi = isOpenCertifi;
+    }
+    public Integer getIsOpenCertifi()
+    {
+        return isOpenCertifi;
+    }
+
+    public void setIsSmartConfig(Integer isSmartConfig)
+    {
+        this.isSmartConfig = isSmartConfig;
+    }
+
+    public Integer getIsSmartConfig()
+    {
+        return isSmartConfig;
+    }
     public void setIsRfControl(Integer isRfControl) 
     {
         this.isRfControl = isRfControl;
@@ -256,6 +300,16 @@ public class IotDeviceSet extends BaseEntity
         this.delFlag = delFlag;
     }
 
+    public void setRadarInterval(Integer radarInterval)
+    {
+        this.radarInterval = radarInterval;
+    }
+
+    public Integer getRadarInterval()
+    {
+        return radarInterval;
+    }
+
     public String getDelFlag() 
     {
         return delFlag;
@@ -272,6 +326,7 @@ public class IotDeviceSet extends BaseEntity
             .append("isHost", getIsHost())
             .append("isReset", getIsReset())
             .append("isAp", getIsAp())
+            .append("isSmartConfig", getIsSmartConfig())
             .append("isRfControl", getIsRfControl())
             .append("isRfLearn", getIsRfLearn())
             .append("isRfClear", getIsRfClear())
@@ -282,6 +337,7 @@ public class IotDeviceSet extends BaseEntity
             .append("ownerId", getOwnerId())
             .append("networkAddress", getNetworkAddress())
             .append("networkIp", getNetworkIp())
+            .append("radarInterval", getRadarInterval())
             .append("delFlag", getDelFlag())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())

spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/domain/IotDeviceStatus.java

@@ -44,8 +44,8 @@ public class IotDeviceStatus extends BaseEntity
     private BigDecimal deviceTemperature;
 
     /** 设备湿度 */
-    @Excel(name = "设备湿度")
-    private BigDecimal deviceHumidity;
+    @Excel(name = "信号")
+    private Integer rssi;
 
     /** 空气温度 */
     @Excel(name = "空气温度")
@@ -71,6 +71,10 @@ public class IotDeviceStatus extends BaseEntity
     @Excel(name = "彩灯模式")
     private Integer lightMode;
 
+    /** 灯渐变时间 */
+    @Excel(name = "渐变时间")
+    private Integer fadeTime;
+
     /** 红灯 */
     @Excel(name = "红灯")
     private Long red;
@@ -149,14 +153,14 @@ public class IotDeviceStatus extends BaseEntity
     {
         return deviceTemperature;
     }
-    public void setDeviceHumidity(BigDecimal deviceHumidity) 
+    public void setRssi(Integer rssi)
     {
-        this.deviceHumidity = deviceHumidity;
+        this.rssi = rssi;
     }
 
-    public BigDecimal getDeviceHumidity() 
+    public Integer getRssi()
     {
-        return deviceHumidity;
+        return rssi;
     }
     public void setAirTemperature(BigDecimal airTemperature) 
     {
@@ -244,6 +248,15 @@ public class IotDeviceStatus extends BaseEntity
         this.delFlag = delFlag;
     }
 
+    public void setFadeTime(Integer fadeTime)
+    {
+        this.fadeTime = fadeTime;
+    }
+    public Integer getFadeTime()
+    {
+        return fadeTime;
+    }
+
     public String getDelFlag() 
     {
         return delFlag;
@@ -259,13 +272,14 @@ public class IotDeviceStatus extends BaseEntity
             .append("lightStatus", getLightStatus())
             .append("isOnline", getIsOnline())
             .append("deviceTemperature", getDeviceTemperature())
-            .append("deviceHumidity", getDeviceHumidity())
+            .append("rssid", getRssi())
             .append("airTemperature", getAirTemperature())
             .append("airHumidity", getAirHumidity())
             .append("triggerSource", getTriggerSource())
             .append("brightness", getBrightness())
             .append("lightInterval", getLightInterval())
             .append("lightMode", getLightMode())
+            .append("fadeTime", getFadeTime())
             .append("red", getRed())
             .append("green", getGreen())
             .append("blue", getBlue())

spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/domain/IotGroup.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.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-05-18
+ */
+public class IotGroup extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备分组 */
+    private Long groupId;
+
+    /** 用户 */
+    @Excel(name = "用户")
+    private Long userId;
+
+    /** 分组名称 */
+    @Excel(name = "分组名称")
+    private String groupName;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer groupOrder;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setGroupName(String groupName) 
+    {
+        this.groupName = groupName;
+    }
+
+    public String getGroupName() 
+    {
+        return groupName;
+    }
+    public void setGroupOrder(Integer groupOrder) 
+    {
+        this.groupOrder = groupOrder;
+    }
+
+    public Integer getGroupOrder() 
+    {
+        return groupOrder;
+    }
+    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("userId", getUserId())
+            .append("groupName", getGroupName())
+            .append("groupOrder", getGroupOrder())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/IotDeviceListDto.java

@@ -0,0 +1,268 @@
+package com.ruoyi.system.domain.vo;
+
+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;
+
+/**
+ * 设备对象 iot_device
+ * 
+ * @author kerwincui
+ * @date 2021-05-06
+ */
+public class IotDeviceListDto extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long deviceId;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    private String deviceNum;
+
+    /** 分类 */
+    @Excel(name = "分类")
+    private Long categoryId;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String deviceName;
+
+    /** 固件版本 */
+    @Excel(name = "固件版本")
+    private String firmwareVersion;
+
+    /** 用户 */
+    @Excel(name = "用户")
+    private String ownerId;
+
+    @Excel(name="用户昵称")
+    private String nickName;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+
+    /** 报警 */
+    @Excel(name = "报警")
+    private Integer isAlarm;
+
+    /** 雷达感应 */
+    @Excel(name = "雷达感应")
+    private Integer isRadar;
+
+    /** 射频遥控 */
+    @Excel(name = "射频遥控")
+    private Integer isRfControl;
+
+    /** 配网地址 */
+    @Excel(name = "配网地址")
+    private String networkAddress;
+
+    /** 配网IP */
+    @Excel(name = "配网IP")
+    private String networkIp;
+
+
+    /** 继电器 */
+    @Excel(name = "继电器")
+    private Integer relayStatus;
+
+    /** 灯状态 */
+    @Excel(name = "灯状态")
+    private Integer lightStatus;
+
+    /** 在线 */
+    @Excel(name = "在线")
+    private Integer isOnline;
+
+    /** 设备温度 */
+    @Excel(name = "设备温度")
+    private BigDecimal deviceTemperature;
+
+    /** 设备湿度 */
+    @Excel(name = "信号")
+    private Integer rssi;
+
+
+
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDeviceNum(String deviceNum) 
+    {
+        this.deviceNum = deviceNum;
+    }
+    public String getDeviceNum() 
+    {
+        return deviceNum;
+    }
+    public void setCategoryId(Long categoryId) 
+    {
+        this.categoryId = categoryId;
+    }
+    public Long getCategoryId() 
+    {
+        return categoryId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setFirmwareVersion(String firmwareVersion) 
+    {
+        this.firmwareVersion = firmwareVersion;
+    }
+    public String getFirmwareVersion() 
+    {
+        return firmwareVersion;
+    }
+    public void setOwnerId(String ownerId) 
+    {
+        this.ownerId = ownerId;
+    }
+    public String getOwnerId() 
+    {
+        return ownerId;
+    }
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+    public String getNickName()
+    {
+        return nickName;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setIsAlarm(Integer isAlarm)
+    {
+        this.isAlarm = isAlarm;
+    }
+    public Integer getIsAlarm()
+    {
+        return isAlarm;
+    }
+    public void setIsRadar(Integer isRadar)
+    {
+        this.isRadar = isRadar;
+    }
+    public Integer getIsRadar()
+    {
+        return isRadar;
+    }
+    public void setIsRfControl(Integer isRfControl)
+    {
+        this.isRfControl = isRfControl;
+    }
+    public Integer getIsRfControl()
+    {
+        return isRfControl;
+    }
+    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 setRelayStatus(Integer relayStatus)
+    {
+        this.relayStatus = relayStatus;
+    }
+    public Integer getRelayStatus()
+    {
+        return relayStatus;
+    }
+    public void setLightStatus(Integer lightStatus)
+    {
+        this.lightStatus = lightStatus;
+    }
+    public Integer getLightStatus()
+    {
+        return lightStatus;
+    }
+    public void setIsOnline(Integer isOnline)
+    {
+        this.isOnline = isOnline;
+    }
+    public Integer getIsOnline()
+    {
+        return isOnline;
+    }
+    public void setDeviceTemperature(BigDecimal deviceTemperature)
+    {
+        this.deviceTemperature = deviceTemperature;
+    }
+    public BigDecimal getDeviceTemperature()
+    {
+        return deviceTemperature;
+    }
+    public void setRssi(Integer rssi)
+    {
+        this.rssi = rssi;
+    }
+    public Integer getRssi()
+    {
+        return rssi;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceId", getDeviceId())
+            .append("deviceNum", getDeviceNum())
+            .append("categoryId", getCategoryId())
+            .append("deviceName", getDeviceName())
+            .append("firmwareVersion", getFirmwareVersion())
+            .append("ownerId", getOwnerId())
+            .append("nickName", getNickName())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+                .append("isAlarm", getIsAlarm())
+                .append("isRadar", getIsRadar())
+                .append("isRfControl", getIsRfControl())
+                .append("networkAddress", getNetworkAddress())
+                .append("networkIp", getNetworkIp())
+                .append("relayStatus", getRelayStatus())
+                .append("lightStatus", getLightStatus())
+                .append("isOnline", getIsOnline())
+                .append("deviceTemperature", getDeviceTemperature())
+                .append("rssid", getRssi())
+            .toString();
+    }
+}