2021年9月2日10:07:12 1.增加微信小程序接口 2.4G开关功能接口

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

@@ -17,63 +17,64 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 设备分类对象 iot_category
- * 
+ *
  * @author kerwincui
  * @date 2021-05-07
  */
-public class IotCategory extends BaseEntity
-{
+public class IotCategory extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 序号 */
+    /**
+     * 序号
+     */
     private Long categoryId;
 
-    /** 分类名称 */
+    /**
+     * 分类名称
+     */
     @Excel(name = "分类名称")
     private String categoryName;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    public void setCategoryId(Long categoryId) 
-    {
+    public void setCategoryId(Long categoryId) {
         this.categoryId = categoryId;
     }
 
-    public Long getCategoryId() 
-    {
+    public Long getCategoryId() {
         return categoryId;
     }
-    public void setCategoryName(String categoryName) 
-    {
+
+    public void setCategoryName(String categoryName) {
         this.categoryName = categoryName;
     }
 
-    public String getCategoryName() 
-    {
+    public String getCategoryName() {
         return categoryName;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("categoryId", getCategoryId())
-            .append("categoryName", getCategoryName())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("categoryId", getCategoryId())
+                .append("categoryName", getCategoryName())
+                .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/IotDevice.java

@@ -19,150 +19,178 @@ import java.math.BigDecimal;
 
 /**
  * 设备对象 iot_device
- * 
+ *
  * @author kerwincui
  * @date 2021-05-06
  */
-public class IotDevice extends BaseEntity
-{
+public class IotDevice 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 categoryName;
 
-    /** 分类名称 */
+    /**
+     * 分类名称
+     */
     @Excel(name = "分类名称")
     private BigDecimal deviceTemp;
 
-    /** 名称 */
+    /**
+     * 名称
+     */
     @Excel(name = "名称")
     private String deviceName;
 
-    /** 固件版本 */
+    /**
+     * 固件版本
+     */
     @Excel(name = "固件版本")
     private String firmwareVersion;
 
-    /** 用户 */
+    /** 设备状态：未激活，未绑定，已绑定 */
+    @Excel(name = "设备状态：未激活，未绑定，已绑定")
+    private String status;
+
+    /**
+     * 用户
+     */
     @Excel(name = "用户")
     private String ownerId;
 
-    /** 分组ID */
+    /**
+     * 分组ID
+     */
     private Long groupId;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    public void setDeviceId(Long deviceId) 
-    {
+    public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
-    public Long getDeviceId() 
-    {
+
+    public Long getDeviceId() {
         return deviceId;
     }
-    public void setDeviceNum(String deviceNum) 
-    {
+
+    public void setDeviceNum(String deviceNum) {
         this.deviceNum = deviceNum;
     }
-    public String getDeviceNum() 
-    {
+
+    public String getDeviceNum() {
         return deviceNum;
     }
-    public void setCategoryId(Long categoryId) 
-    {
+
+    public void setCategoryId(Long categoryId) {
         this.categoryId = categoryId;
     }
-    public Long getCategoryId() 
-    {
+
+    public Long getCategoryId() {
         return categoryId;
     }
-    public void setDeviceName(String deviceName) 
-    {
+
+    public void setDeviceName(String deviceName) {
         this.deviceName = deviceName;
     }
-    public String getDeviceName() 
-    {
+
+    public String getDeviceName() {
         return deviceName;
     }
-    public void setFirmwareVersion(String firmwareVersion) 
-    {
+
+    public void setFirmwareVersion(String firmwareVersion) {
         this.firmwareVersion = firmwareVersion;
     }
-    public String getFirmwareVersion() 
-    {
+
+    public String getFirmwareVersion() {
         return firmwareVersion;
     }
-    public void setOwnerId(String ownerId) 
-    {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-    public String getOwnerId() 
-    {
+
+    public String getOwnerId() {
         return ownerId;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public String getDelFlag() 
-    {
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+    public String getDelFlag() {
         return delFlag;
     }
-    public Long getGroupId()
-    {
+
+    public Long getGroupId() {
         return groupId;
     }
-    public void setGroupId(Long groupId)
-    {
+
+    public void setGroupId(Long groupId) {
         this.groupId = groupId;
     }
-    public void setDeviceTemp(BigDecimal deviceTemp)
-    {
+
+    public void setDeviceTemp(BigDecimal deviceTemp) {
         this.deviceTemp = deviceTemp;
     }
-    public BigDecimal getDeviceTemp()
-    {
+
+    public BigDecimal getDeviceTemp() {
         return deviceTemp;
     }
-    public void setCategoryName(String categoryName)
-    {
+
+    public void setCategoryName(String categoryName) {
         this.categoryName = categoryName;
     }
-    public String getCategoryName()
-    {
+
+    public String getCategoryName() {
         return categoryName;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deviceId", getDeviceId())
-            .append("deviceNum", getDeviceNum())
-            .append("categoryName", getCategoryName())
-            .append("deviceTemp", getDeviceTemp())
-            .append("categoryId", getCategoryId())
-            .append("groupId", getGroupId())
-            .append("deviceName", getDeviceName())
-            .append("firmwareVersion", getFirmwareVersion())
-            .append("ownerId", getOwnerId())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("deviceId", getDeviceId())
+                .append("deviceNum", getDeviceNum())
+                .append("categoryName", getCategoryName())
+                .append("deviceTemp", getDeviceTemp())
+                .append("categoryId", getCategoryId())
+                .append("groupId", getGroupId())
+                .append("deviceName", getDeviceName())
+                .append("firmwareVersion", getFirmwareVersion())
+                .append("ownerId", getOwnerId())
+                .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/IotDeviceSet.java

@@ -17,343 +17,362 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 设备配置对象 iot_device_set
- * 
+ *
  * @author kerwincui
  * @date 2021-05-06
  */
-public class IotDeviceSet extends BaseEntity
-{
+public class IotDeviceSet extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 序号 */
+    /**
+     * 序号
+     */
     private Long deviceSetId;
 
-    /** 设备 */
+    /**
+     * 设备
+     */
     @Excel(name = "设备")
     private Long deviceId;
 
-    /** 设备编号 */
+    /**
+     * 设备编号
+     */
     @Excel(name = "设备编号")
     private String deviceNum;
 
-    /** 报警 */
+    /**
+     * 报警
+     */
     @Excel(name = "报警")
     private Integer isAlarm;
 
-    /** 雷达感应 */
+    /**
+     * 雷达感应
+     */
     @Excel(name = "雷达感应")
     private Integer isRadar;
 
-    /** 托管 */
+    /**
+     * 托管
+     */
     @Excel(name = "托管")
     private Integer isHost;
 
-    /** 重启 */
+    /**
+     * 重启
+     */
     @Excel(name = "重启")
     private Integer isReset;
 
-    /** 打开AP */
+    /**
+     * 打开AP
+     */
     @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;
 
-    /** 遥控配对 */
+    /**
+     * 遥控配对
+     */
     @Excel(name = "遥控配对")
     private Integer isRfLearn;
 
-    /** 遥控清码 */
+    /**
+     * 遥控清码
+     */
     @Excel(name = "遥控清码")
     private Integer isRfClear;
 
-    /** 按键一 */
+    /**
+     * 按键一
+     */
     @Excel(name = "按键一")
     private Integer rfOneFunc;
 
-    /** 按键二 */
+    /**
+     * 按键二
+     */
     @Excel(name = "按键二")
     private Integer rfTwoFunc;
 
-    /** 按键三 */
+    /**
+     * 按键三
+     */
     @Excel(name = "按键三")
     private Integer rfThreeFunc;
 
-    /** 按键四 */
+    /**
+     * 按键四
+     */
     @Excel(name = "按键四")
     private Integer rfFourFunc;
 
-    /** 用户 */
+    /**
+     * 用户
+     */
     @Excel(name = "用户")
     private String ownerId;
 
-    /** 配网地址 */
+    /**
+     * 配网地址
+     */
     @Excel(name = "配网地址")
     private String networkAddress;
 
-    /** 配网IP */
+    /**
+     * 配网IP
+     */
     @Excel(name = "配网IP")
     private String networkIp;
 
-    /** 雷达感应间隔 */
+    /**
+     * 雷达感应间隔
+     */
     @Excel(name = "雷达感应间隔")
     private Integer radarInterval;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    public void setDeviceSetId(Long deviceSetId)
-    {
+    public void setDeviceSetId(Long deviceSetId) {
         this.deviceSetId = deviceSetId;
     }
 
-    public Long getDeviceSetId()
-    {
+    public Long getDeviceSetId() {
         return deviceSetId;
     }
-    public void setDeviceId(Long deviceId) 
-    {
+
+    public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId() 
-    {
+    public Long getDeviceId() {
         return deviceId;
     }
-    public void setDeviceNum(String deviceNum) 
-    {
+
+    public void setDeviceNum(String deviceNum) {
         this.deviceNum = deviceNum;
     }
 
-    public String getDeviceNum() 
-    {
+    public String getDeviceNum() {
         return deviceNum;
     }
-    public void setIsAlarm(Integer isAlarm) 
-    {
+
+    public void setIsAlarm(Integer isAlarm) {
         this.isAlarm = isAlarm;
     }
 
-    public Integer getIsAlarm() 
-    {
+    public Integer getIsAlarm() {
         return isAlarm;
     }
-    public void setIsRadar(Integer isRadar) 
-    {
+
+    public void setIsRadar(Integer isRadar) {
         this.isRadar = isRadar;
     }
 
-    public Integer getIsRadar() 
-    {
+    public Integer getIsRadar() {
         return isRadar;
     }
-    public void setIsHost(Integer isHost) 
-    {
+
+    public void setIsHost(Integer isHost) {
         this.isHost = isHost;
     }
 
-    public Integer getIsHost() 
-    {
+    public Integer getIsHost() {
         return isHost;
     }
-    public void setIsReset(Integer isReset) 
-    {
+
+    public void setIsReset(Integer isReset) {
         this.isReset = isReset;
     }
 
-    public Integer getIsReset() 
-    {
+    public Integer getIsReset() {
         return isReset;
     }
 
-    public void setIsAp(Integer isAp) 
-    {
+    public void setIsAp(Integer isAp) {
         this.isAp = isAp;
     }
-    public Integer getIsAp() 
-    {
+
+    public Integer getIsAp() {
         return isAp;
     }
 
-    public void setIsWifiOffline(Integer isWifiOffline)
-    {
+    public void setIsWifiOffline(Integer isWifiOffline) {
         this.isWifiOffline = isWifiOffline;
     }
-    public Integer getIsWifiOffline()
-    {
+
+    public Integer getIsWifiOffline() {
         return isWifiOffline;
     }
 
-    public void setIsOpenCertifi(Integer isOpenCertifi)
-    {
+    public void setIsOpenCertifi(Integer isOpenCertifi) {
         this.isOpenCertifi = isOpenCertifi;
     }
-    public Integer getIsOpenCertifi()
-    {
+
+    public Integer getIsOpenCertifi() {
         return isOpenCertifi;
     }
 
-    public void setIsSmartConfig(Integer isSmartConfig)
-    {
+    public void setIsSmartConfig(Integer isSmartConfig) {
         this.isSmartConfig = isSmartConfig;
     }
 
-    public Integer getIsSmartConfig()
-    {
+    public Integer getIsSmartConfig() {
         return isSmartConfig;
     }
-    public void setIsRfControl(Integer isRfControl) 
-    {
+
+    public void setIsRfControl(Integer isRfControl) {
         this.isRfControl = isRfControl;
     }
 
-    public Integer getIsRfControl() 
-    {
+    public Integer getIsRfControl() {
         return isRfControl;
     }
-    public void setIsRfLearn(Integer isRfLearn) 
-    {
+
+    public void setIsRfLearn(Integer isRfLearn) {
         this.isRfLearn = isRfLearn;
     }
 
-    public Integer getIsRfLearn() 
-    {
+    public Integer getIsRfLearn() {
         return isRfLearn;
     }
-    public void setIsRfClear(Integer isRfClear) 
-    {
+
+    public void setIsRfClear(Integer isRfClear) {
         this.isRfClear = isRfClear;
     }
 
-    public Integer getIsRfClear() 
-    {
+    public Integer getIsRfClear() {
         return isRfClear;
     }
-    public void setRfOneFunc(Integer rfOneFunc) 
-    {
+
+    public void setRfOneFunc(Integer rfOneFunc) {
         this.rfOneFunc = rfOneFunc;
     }
 
-    public Integer getRfOneFunc() 
-    {
+    public Integer getRfOneFunc() {
         return rfOneFunc;
     }
-    public void setRfTwoFunc(Integer rfTwoFunc) 
-    {
+
+    public void setRfTwoFunc(Integer rfTwoFunc) {
         this.rfTwoFunc = rfTwoFunc;
     }
 
-    public Integer getRfTwoFunc() 
-    {
+    public Integer getRfTwoFunc() {
         return rfTwoFunc;
     }
-    public void setRfThreeFunc(Integer rfThreeFunc) 
-    {
+
+    public void setRfThreeFunc(Integer rfThreeFunc) {
         this.rfThreeFunc = rfThreeFunc;
     }
 
-    public Integer getRfThreeFunc() 
-    {
+    public Integer getRfThreeFunc() {
         return rfThreeFunc;
     }
-    public void setRfFourFunc(Integer rfFourFunc) 
-    {
+
+    public void setRfFourFunc(Integer rfFourFunc) {
         this.rfFourFunc = rfFourFunc;
     }
 
-    public Integer getRfFourFunc() 
-    {
+    public Integer getRfFourFunc() {
         return rfFourFunc;
     }
-    public void setOwnerId(String ownerId) 
-    {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
 
-    public String getOwnerId() 
-    {
+    public String getOwnerId() {
         return ownerId;
     }
-    public void setNetworkAddress(String networkAddress) 
-    {
+
+    public void setNetworkAddress(String networkAddress) {
         this.networkAddress = networkAddress;
     }
 
-    public String getNetworkAddress() 
-    {
+    public String getNetworkAddress() {
         return networkAddress;
     }
-    public void setNetworkIp(String networkIp) 
-    {
+
+    public void setNetworkIp(String networkIp) {
         this.networkIp = networkIp;
     }
 
-    public String getNetworkIp() 
-    {
+    public String getNetworkIp() {
         return networkIp;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public void setRadarInterval(Integer radarInterval)
-    {
+    public void setRadarInterval(Integer radarInterval) {
         this.radarInterval = radarInterval;
     }
 
-    public Integer getRadarInterval()
-    {
+    public Integer getRadarInterval() {
         return radarInterval;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deviceSetId", getDeviceSetId())
-            .append("deviceId", getDeviceId())
-            .append("deviceNum", getDeviceNum())
-            .append("isAlarm", getIsAlarm())
-            .append("isRadar", getIsRadar())
-            .append("isHost", getIsHost())
-            .append("isReset", getIsReset())
-            .append("isAp", getIsAp())
-            .append("isSmartConfig", getIsSmartConfig())
-            .append("isRfControl", getIsRfControl())
-            .append("isRfLearn", getIsRfLearn())
-            .append("isRfClear", getIsRfClear())
-            .append("rfOneFunc", getRfOneFunc())
-            .append("rfTwoFunc", getRfTwoFunc())
-            .append("rfThreeFunc", getRfThreeFunc())
-            .append("rfFourFunc", getRfFourFunc())
-            .append("ownerId", getOwnerId())
-            .append("networkAddress", getNetworkAddress())
-            .append("networkIp", getNetworkIp())
-            .append("radarInterval", getRadarInterval())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("deviceSetId", getDeviceSetId())
+                .append("deviceId", getDeviceId())
+                .append("deviceNum", getDeviceNum())
+                .append("isAlarm", getIsAlarm())
+                .append("isRadar", getIsRadar())
+                .append("isHost", getIsHost())
+                .append("isReset", getIsReset())
+                .append("isAp", getIsAp())
+                .append("isSmartConfig", getIsSmartConfig())
+                .append("isRfControl", getIsRfControl())
+                .append("isRfLearn", getIsRfLearn())
+                .append("isRfClear", getIsRfClear())
+                .append("rfOneFunc", getRfOneFunc())
+                .append("rfTwoFunc", getRfTwoFunc())
+                .append("rfThreeFunc", getRfThreeFunc())
+                .append("rfFourFunc", getRfFourFunc())
+                .append("ownerId", getOwnerId())
+                .append("networkAddress", getNetworkAddress())
+                .append("networkIp", getNetworkIp())
+                .append("radarInterval", getRadarInterval())
+                .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/IotDeviceStatus.java

@@ -11,6 +11,7 @@
 package com.ruoyi.system.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;
@@ -18,287 +19,304 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 设备状态对象 iot_device_status
- * 
+ *
  * @author kerwincui
  * @date 2021-05-06
  */
-public class IotDeviceStatus extends BaseEntity
-{
+public class IotDeviceStatus extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 序号 */
+    /**
+     * 序号
+     */
     private Long deviceStatusId;
 
-    /** 设备 */
+    /**
+     * 设备
+     */
     @Excel(name = "设备")
     private Long deviceId;
 
-    /** 设备编号 */
+    /**
+     * 设备编号
+     */
     @Excel(name = "设备编号")
     private String deviceNum;
 
-    /** 继电器 */
+    /**
+     * 继电器
+     */
     @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;
 
-    /** 空气温度 */
+    /**
+     * 空气温度
+     */
     @Excel(name = "空气温度")
     private BigDecimal airTemperature;
 
-    /** 空气湿度 */
+    /**
+     * 空气湿度
+     */
     @Excel(name = "空气湿度")
     private BigDecimal airHumidity;
 
-    /** 触发源 */
+    /**
+     * 触发源
+     */
     @Excel(name = "触发源")
     private Integer triggerSource;
 
-    /** 彩灯亮度 */
+    /**
+     * 彩灯亮度
+     */
     @Excel(name = "彩灯亮度")
     private Integer brightness;
 
-    /** 渐变间隔 */
+    /**
+     * 渐变间隔
+     */
     @Excel(name = "渐变间隔")
     private Integer lightInterval;
 
-    /** 彩灯模式 */
+    /**
+     * 彩灯模式
+     */
     @Excel(name = "彩灯模式")
     private Integer lightMode;
 
-    /** 灯渐变时间 */
+    /**
+     * 灯渐变时间
+     */
     @Excel(name = "渐变时间")
     private Integer fadeTime;
 
-    /** 红灯 */
+    /**
+     * 红灯
+     */
     @Excel(name = "红灯")
     private Long red;
 
-    /** 绿灯 */
+    /**
+     * 绿灯
+     */
     @Excel(name = "绿灯")
     private Long green;
 
-    /** 蓝灯 */
+    /**
+     * 蓝灯
+     */
     @Excel(name = "蓝灯")
     private Long blue;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    public void setDeviceStatusId(Long deviceStatusId) 
-    {
+    public void setDeviceStatusId(Long deviceStatusId) {
         this.deviceStatusId = deviceStatusId;
     }
 
-    public Long getDeviceStatusId() 
-    {
+    public Long getDeviceStatusId() {
         return deviceStatusId;
     }
-    public void setDeviceId(Long deviceId) 
-    {
+
+    public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId() 
-    {
+    public Long getDeviceId() {
         return deviceId;
     }
-    public void setDeviceNum(String deviceNum) 
-    {
+
+    public void setDeviceNum(String deviceNum) {
         this.deviceNum = deviceNum;
     }
 
-    public String getDeviceNum() 
-    {
+    public String getDeviceNum() {
         return deviceNum;
     }
-    public void setRelayStatus(Integer relayStatus) 
-    {
+
+    public void setRelayStatus(Integer relayStatus) {
         this.relayStatus = relayStatus;
     }
 
-    public Integer getRelayStatus() 
-    {
+    public Integer getRelayStatus() {
         return relayStatus;
     }
-    public void setLightStatus(Integer lightStatus) 
-    {
+
+    public void setLightStatus(Integer lightStatus) {
         this.lightStatus = lightStatus;
     }
 
-    public Integer getLightStatus() 
-    {
+    public Integer getLightStatus() {
         return lightStatus;
     }
-    public void setIsOnline(Integer isOnline) 
-    {
+
+    public void setIsOnline(Integer isOnline) {
         this.isOnline = isOnline;
     }
 
-    public Integer getIsOnline() 
-    {
+    public Integer getIsOnline() {
         return isOnline;
     }
-    public void setDeviceTemperature(BigDecimal deviceTemperature) 
-    {
+
+    public void setDeviceTemperature(BigDecimal deviceTemperature) {
         this.deviceTemperature = deviceTemperature;
     }
 
-    public BigDecimal getDeviceTemperature() 
-    {
+    public BigDecimal getDeviceTemperature() {
         return deviceTemperature;
     }
-    public void setRssi(Integer rssi)
-    {
+
+    public void setRssi(Integer rssi) {
         this.rssi = rssi;
     }
 
-    public Integer getRssi()
-    {
+    public Integer getRssi() {
         return rssi;
     }
-    public void setAirTemperature(BigDecimal airTemperature) 
-    {
+
+    public void setAirTemperature(BigDecimal airTemperature) {
         this.airTemperature = airTemperature;
     }
 
-    public BigDecimal getAirTemperature() 
-    {
+    public BigDecimal getAirTemperature() {
         return airTemperature;
     }
-    public void setAirHumidity(BigDecimal airHumidity) 
-    {
+
+    public void setAirHumidity(BigDecimal airHumidity) {
         this.airHumidity = airHumidity;
     }
 
-    public BigDecimal getAirHumidity() 
-    {
+    public BigDecimal getAirHumidity() {
         return airHumidity;
     }
-    public void setTriggerSource(Integer triggerSource) 
-    {
+
+    public void setTriggerSource(Integer triggerSource) {
         this.triggerSource = triggerSource;
     }
 
-    public Integer getTriggerSource() 
-    {
+    public Integer getTriggerSource() {
         return triggerSource;
     }
-    public void setBrightness(Integer brightness) 
-    {
+
+    public void setBrightness(Integer brightness) {
         this.brightness = brightness;
     }
 
-    public Integer getBrightness() 
-    {
+    public Integer getBrightness() {
         return brightness;
     }
-    public void setLightInterval(Integer lightInterval) 
-    {
+
+    public void setLightInterval(Integer lightInterval) {
         this.lightInterval = lightInterval;
     }
 
-    public Integer getLightInterval() 
-    {
+    public Integer getLightInterval() {
         return lightInterval;
     }
-    public void setLightMode(Integer lightMode) 
-    {
+
+    public void setLightMode(Integer lightMode) {
         this.lightMode = lightMode;
     }
 
-    public Integer getLightMode() 
-    {
+    public Integer getLightMode() {
         return lightMode;
     }
-    public void setRed(Long red) 
-    {
+
+    public void setRed(Long red) {
         this.red = red;
     }
 
-    public Long getRed() 
-    {
+    public Long getRed() {
         return red;
     }
-    public void setGreen(Long green) 
-    {
+
+    public void setGreen(Long green) {
         this.green = green;
     }
 
-    public Long getGreen() 
-    {
+    public Long getGreen() {
         return green;
     }
-    public void setBlue(Long blue) 
-    {
+
+    public void setBlue(Long blue) {
         this.blue = blue;
     }
 
-    public Long getBlue() 
-    {
+    public Long getBlue() {
         return blue;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public void setFadeTime(Integer fadeTime)
-    {
+    public void setFadeTime(Integer fadeTime) {
         this.fadeTime = fadeTime;
     }
-    public Integer getFadeTime()
-    {
+
+    public Integer getFadeTime() {
         return fadeTime;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deviceStatusId", getDeviceStatusId())
-            .append("deviceId", getDeviceId())
-            .append("deviceNum", getDeviceNum())
-            .append("relayStatus", getRelayStatus())
-            .append("lightStatus", getLightStatus())
-            .append("isOnline", getIsOnline())
-            .append("deviceTemperature", getDeviceTemperature())
-            .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())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("deviceStatusId", getDeviceStatusId())
+                .append("deviceId", getDeviceId())
+                .append("deviceNum", getDeviceNum())
+                .append("relayStatus", getRelayStatus())
+                .append("lightStatus", getLightStatus())
+                .append("isOnline", getIsOnline())
+                .append("deviceTemperature", getDeviceTemperature())
+                .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())
+                .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/IotDeviceUserRelation.java

@@ -0,0 +1,136 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_relation
+ *
+ * @author wxy
+ * @date 2021-08-27
+ */
+public class IotDeviceUserRelation extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long userId;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long deviceId;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceNum;
+
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceName;
+
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String remark;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date gmtTime;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date gmtUpdate;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    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 String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public void setDeviceNum(String deviceNum) {
+        this.deviceNum = deviceNum;
+    }
+
+    public String getDeviceNum() {
+        return deviceNum;
+    }
+
+    public void setGmtTime(Date gmtTime) {
+        this.gmtTime = gmtTime;
+    }
+
+    public Date getGmtTime() {
+        return gmtTime;
+    }
+
+    public void setGmtUpdate(Date gmtUpdate) {
+        this.gmtUpdate = gmtUpdate;
+    }
+
+    public Date getGmtUpdate() {
+        return gmtUpdate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("userId", getUserId())
+                .append("deviceId", getDeviceId())
+                .append("deviceNum", getDeviceNum())
+                .append("gmtTime", getGmtTime())
+                .append("gmtUpdate", getGmtUpdate())
+                .toString();
+    }
+}

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

@@ -17,91 +17,94 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 分组对象 iot_group
- * 
+ *
  * @author kerwincui
  * @date 2021-05-18
  */
-public class IotGroup extends BaseEntity
-{
+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代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    public void setGroupId(Long groupId) 
-    {
+    public void setGroupId(Long groupId) {
         this.groupId = groupId;
     }
 
-    public Long getGroupId() 
-    {
+    public Long getGroupId() {
         return groupId;
     }
-    public void setUserId(Long userId) 
-    {
+
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId() 
-    {
+    public Long getUserId() {
         return userId;
     }
-    public void setGroupName(String groupName) 
-    {
+
+    public void setGroupName(String groupName) {
         this.groupName = groupName;
     }
 
-    public String getGroupName() 
-    {
+    public String getGroupName() {
         return groupName;
     }
-    public void setGroupOrder(Integer groupOrder) 
-    {
+
+    public void setGroupOrder(Integer groupOrder) {
         this.groupOrder = groupOrder;
     }
 
-    public Integer getGroupOrder() 
-    {
+    public Integer getGroupOrder() {
         return groupOrder;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
-    {
+    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();
+        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/SysConfig.java

@@ -12,6 +12,7 @@ package com.ruoyi.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -20,102 +21,101 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 参数配置表 sys_config
- * 
+ *
  * @author ruoyi
  */
-public class SysConfig extends BaseEntity
-{
+public class SysConfig extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 参数主键 */
+    /**
+     * 参数主键
+     */
     @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
     private Long configId;
 
-    /** 参数名称 */
+    /**
+     * 参数名称
+     */
     @Excel(name = "参数名称")
     private String configName;
 
-    /** 参数键名 */
+    /**
+     * 参数键名
+     */
     @Excel(name = "参数键名")
     private String configKey;
 
-    /** 参数键值 */
+    /**
+     * 参数键值
+     */
     @Excel(name = "参数键值")
     private String configValue;
 
-    /** 系统内置（Y是 N否） */
+    /**
+     * 系统内置（Y是 N否）
+     */
     @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
     private String configType;
 
-    public Long getConfigId()
-    {
+    public Long getConfigId() {
         return configId;
     }
 
-    public void setConfigId(Long configId)
-    {
+    public void setConfigId(Long configId) {
         this.configId = configId;
     }
 
     @NotBlank(message = "参数名称不能为空")
     @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
-    public String getConfigName()
-    {
+    public String getConfigName() {
         return configName;
     }
 
-    public void setConfigName(String configName)
-    {
+    public void setConfigName(String configName) {
         this.configName = configName;
     }
 
     @NotBlank(message = "参数键名长度不能为空")
     @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
-    public String getConfigKey()
-    {
+    public String getConfigKey() {
         return configKey;
     }
 
-    public void setConfigKey(String configKey)
-    {
+    public void setConfigKey(String configKey) {
         this.configKey = configKey;
     }
 
     @NotBlank(message = "参数键值不能为空")
     @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
-    public String getConfigValue()
-    {
+    public String getConfigValue() {
         return configValue;
     }
 
-    public void setConfigValue(String configValue)
-    {
+    public void setConfigValue(String configValue) {
         this.configValue = configValue;
     }
 
-    public String getConfigType()
-    {
+    public String getConfigType() {
         return configType;
     }
 
-    public void setConfigType(String configType)
-    {
+    public void setConfigType(String configType) {
         this.configType = configType;
     }
-    
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("configId", getConfigId())
-            .append("configName", getConfigName())
-            .append("configKey", getConfigKey())
-            .append("configValue", getConfigValue())
-            .append("configType", getConfigType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("configId", getConfigId())
+                .append("configName", getConfigName())
+                .append("configKey", getConfigKey())
+                .append("configValue", getConfigValue())
+                .append("configType", getConfigType())
+                .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/SysLogininfor.java

@@ -11,6 +11,7 @@
 package com.ruoyi.system.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -18,137 +19,136 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 系统访问记录表 sys_logininfor
- * 
+ *
  * @author ruoyi
  */
-public class SysLogininfor extends BaseEntity
-{
+public class SysLogininfor extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    /**
+     * ID
+     */
     @Excel(name = "序号", cellType = ColumnType.NUMERIC)
     private Long infoId;
 
-    /** 用户账号 */
+    /**
+     * 用户账号
+     */
     @Excel(name = "用户账号")
     private String userName;
 
-    /** 登录状态 0成功 1失败 */
+    /**
+     * 登录状态 0成功 1失败
+     */
     @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
     private String status;
 
-    /** 登录IP地址 */
+    /**
+     * 登录IP地址
+     */
     @Excel(name = "登录地址")
     private String ipaddr;
 
-    /** 登录地点 */
+    /**
+     * 登录地点
+     */
     @Excel(name = "登录地点")
     private String loginLocation;
 
-    /** 浏览器类型 */
+    /**
+     * 浏览器类型
+     */
     @Excel(name = "浏览器")
     private String browser;
 
-    /** 操作系统 */
+    /**
+     * 操作系统
+     */
     @Excel(name = "操作系统")
     private String os;
 
-    /** 提示消息 */
+    /**
+     * 提示消息
+     */
     @Excel(name = "提示消息")
     private String msg;
 
-    /** 访问时间 */
+    /**
+     * 访问时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date loginTime;
 
-    public Long getInfoId()
-    {
+    public Long getInfoId() {
         return infoId;
     }
 
-    public void setInfoId(Long infoId)
-    {
+    public void setInfoId(Long infoId) {
         this.infoId = infoId;
     }
 
-    public String getUserName()
-    {
+    public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName)
-    {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-    public String getStatus()
-    {
+    public String getStatus() {
         return status;
     }
 
-    public void setStatus(String status)
-    {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-    public String getIpaddr()
-    {
+    public String getIpaddr() {
         return ipaddr;
     }
 
-    public void setIpaddr(String ipaddr)
-    {
+    public void setIpaddr(String ipaddr) {
         this.ipaddr = ipaddr;
     }
 
-    public String getLoginLocation()
-    {
+    public String getLoginLocation() {
         return loginLocation;
     }
 
-    public void setLoginLocation(String loginLocation)
-    {
+    public void setLoginLocation(String loginLocation) {
         this.loginLocation = loginLocation;
     }
 
-    public String getBrowser()
-    {
+    public String getBrowser() {
         return browser;
     }
 
-    public void setBrowser(String browser)
-    {
+    public void setBrowser(String browser) {
         this.browser = browser;
     }
 
-    public String getOs()
-    {
+    public String getOs() {
         return os;
     }
 
-    public void setOs(String os)
-    {
+    public void setOs(String os) {
         this.os = os;
     }
 
-    public String getMsg()
-    {
+    public String getMsg() {
         return msg;
     }
 
-    public void setMsg(String msg)
-    {
+    public void setMsg(String msg) {
         this.msg = msg;
     }
 
-    public Date getLoginTime()
-    {
+    public Date getLoginTime() {
         return loginTime;
     }
 
-    public void setLoginTime(Date loginTime)
-    {
+    public void setLoginTime(Date loginTime) {
         this.loginTime = loginTime;
     }
 }

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

@@ -12,99 +12,99 @@ package com.ruoyi.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 通知公告表 sys_notice
- * 
+ *
  * @author ruoyi
  */
-public class SysNotice extends BaseEntity
-{
+public class SysNotice extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 公告ID */
+    /**
+     * 公告ID
+     */
     private Long noticeId;
 
-    /** 公告标题 */
+    /**
+     * 公告标题
+     */
     private String noticeTitle;
 
-    /** 公告类型（1通知 2公告） */
+    /**
+     * 公告类型（1通知 2公告）
+     */
     private String noticeType;
 
-    /** 公告内容 */
+    /**
+     * 公告内容
+     */
     private String noticeContent;
 
-    /** 公告状态（0正常 1关闭） */
+    /**
+     * 公告状态（0正常 1关闭）
+     */
     private String status;
 
-    public Long getNoticeId()
-    {
+    public Long getNoticeId() {
         return noticeId;
     }
 
-    public void setNoticeId(Long noticeId)
-    {
+    public void setNoticeId(Long noticeId) {
         this.noticeId = noticeId;
     }
 
-    public void setNoticeTitle(String noticeTitle)
-    {
+    public void setNoticeTitle(String noticeTitle) {
         this.noticeTitle = noticeTitle;
     }
 
     @NotBlank(message = "公告标题不能为空")
     @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
-    public String getNoticeTitle()
-    {
+    public String getNoticeTitle() {
         return noticeTitle;
     }
 
-    public void setNoticeType(String noticeType)
-    {
+    public void setNoticeType(String noticeType) {
         this.noticeType = noticeType;
     }
 
-    public String getNoticeType()
-    {
+    public String getNoticeType() {
         return noticeType;
     }
 
-    public void setNoticeContent(String noticeContent)
-    {
+    public void setNoticeContent(String noticeContent) {
         this.noticeContent = noticeContent;
     }
 
-    public String getNoticeContent()
-    {
+    public String getNoticeContent() {
         return noticeContent;
     }
 
-    public void setStatus(String status)
-    {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-    public String getStatus()
-    {
+    public String getStatus() {
         return status;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("noticeId", getNoticeId())
+                .append("noticeTitle", getNoticeTitle())
+                .append("noticeType", getNoticeType())
+                .append("noticeContent", getNoticeContent())
+                .append("status", getStatus())
+                .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/SysOperLog.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -8,248 +9,247 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 操作日志记录表 oper_log
- * 
+ *
  * @author ruoyi
  */
-public class SysOperLog extends BaseEntity
-{
+public class SysOperLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 日志主键 */
+    /**
+     * 日志主键
+     */
     @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
     private Long operId;
 
-    /** 操作模块 */
+    /**
+     * 操作模块
+     */
     @Excel(name = "操作模块")
     private String title;
 
-    /** 业务类型（0其它 1新增 2修改 3删除） */
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
     @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
     private Integer businessType;
 
-    /** 业务类型数组 */
+    /**
+     * 业务类型数组
+     */
     private Integer[] businessTypes;
 
-    /** 请求方法 */
+    /**
+     * 请求方法
+     */
     @Excel(name = "请求方法")
     private String method;
 
-    /** 请求方式 */
+    /**
+     * 请求方式
+     */
     @Excel(name = "请求方式")
     private String requestMethod;
 
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
     @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
     private Integer operatorType;
 
-    /** 操作人员 */
+    /**
+     * 操作人员
+     */
     @Excel(name = "操作人员")
     private String operName;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     @Excel(name = "部门名称")
     private String deptName;
 
-    /** 请求url */
+    /**
+     * 请求url
+     */
     @Excel(name = "请求地址")
     private String operUrl;
 
-    /** 操作地址 */
+    /**
+     * 操作地址
+     */
     @Excel(name = "操作地址")
     private String operIp;
 
-    /** 操作地点 */
+    /**
+     * 操作地点
+     */
     @Excel(name = "操作地点")
     private String operLocation;
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     @Excel(name = "请求参数")
     private String operParam;
 
-    /** 返回参数 */
+    /**
+     * 返回参数
+     */
     @Excel(name = "返回参数")
     private String jsonResult;
 
-    /** 操作状态（0正常 1异常） */
+    /**
+     * 操作状态（0正常 1异常）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
     private Integer status;
 
-    /** 错误消息 */
+    /**
+     * 错误消息
+     */
     @Excel(name = "错误消息")
     private String errorMsg;
 
-    /** 操作时间 */
+    /**
+     * 操作时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
-    public Long getOperId()
-    {
+    public Long getOperId() {
         return operId;
     }
 
-    public void setOperId(Long operId)
-    {
+    public void setOperId(Long operId) {
         this.operId = operId;
     }
 
-    public String getTitle()
-    {
+    public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title)
-    {
+    public void setTitle(String title) {
         this.title = title;
     }
 
-    public Integer getBusinessType()
-    {
+    public Integer getBusinessType() {
         return businessType;
     }
 
-    public void setBusinessType(Integer businessType)
-    {
+    public void setBusinessType(Integer businessType) {
         this.businessType = businessType;
     }
 
-    public Integer[] getBusinessTypes()
-    {
+    public Integer[] getBusinessTypes() {
         return businessTypes;
     }
 
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
+    public void setBusinessTypes(Integer[] businessTypes) {
         this.businessTypes = businessTypes;
     }
 
-    public String getMethod()
-    {
+    public String getMethod() {
         return method;
     }
 
-    public void setMethod(String method)
-    {
+    public void setMethod(String method) {
         this.method = method;
     }
 
-    public String getRequestMethod()
-    {
+    public String getRequestMethod() {
         return requestMethod;
     }
 
-    public void setRequestMethod(String requestMethod)
-    {
+    public void setRequestMethod(String requestMethod) {
         this.requestMethod = requestMethod;
     }
 
-    public Integer getOperatorType()
-    {
+    public Integer getOperatorType() {
         return operatorType;
     }
 
-    public void setOperatorType(Integer operatorType)
-    {
+    public void setOperatorType(Integer operatorType) {
         this.operatorType = operatorType;
     }
 
-    public String getOperName()
-    {
+    public String getOperName() {
         return operName;
     }
 
-    public void setOperName(String operName)
-    {
+    public void setOperName(String operName) {
         this.operName = operName;
     }
 
-    public String getDeptName()
-    {
+    public String getDeptName() {
         return deptName;
     }
 
-    public void setDeptName(String deptName)
-    {
+    public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
 
-    public String getOperUrl()
-    {
+    public String getOperUrl() {
         return operUrl;
     }
 
-    public void setOperUrl(String operUrl)
-    {
+    public void setOperUrl(String operUrl) {
         this.operUrl = operUrl;
     }
 
-    public String getOperIp()
-    {
+    public String getOperIp() {
         return operIp;
     }
 
-    public void setOperIp(String operIp)
-    {
+    public void setOperIp(String operIp) {
         this.operIp = operIp;
     }
 
-    public String getOperLocation()
-    {
+    public String getOperLocation() {
         return operLocation;
     }
 
-    public void setOperLocation(String operLocation)
-    {
+    public void setOperLocation(String operLocation) {
         this.operLocation = operLocation;
     }
 
-    public String getOperParam()
-    {
+    public String getOperParam() {
         return operParam;
     }
 
-    public void setOperParam(String operParam)
-    {
+    public void setOperParam(String operParam) {
         this.operParam = operParam;
     }
 
-    public String getJsonResult()
-    {
+    public String getJsonResult() {
         return jsonResult;
     }
 
-    public void setJsonResult(String jsonResult)
-    {
+    public void setJsonResult(String jsonResult) {
         this.jsonResult = jsonResult;
     }
 
-    public Integer getStatus()
-    {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(Integer status)
-    {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public String getErrorMsg()
-    {
+    public String getErrorMsg() {
         return errorMsg;
     }
 
-    public void setErrorMsg(String errorMsg)
-    {
+    public void setErrorMsg(String errorMsg) {
         this.errorMsg = errorMsg;
     }
 
-    public Date getOperTime()
-    {
+    public Date getOperTime() {
         return operTime;
     }
 
-    public void setOperTime(Date operTime)
-    {
+    public void setOperTime(Date operTime) {
         this.operTime = operTime;
     }
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -10,114 +11,113 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 岗位表 sys_post
- * 
+ *
  * @author ruoyi
  */
-public class SysPost extends BaseEntity
-{
+public class SysPost extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 岗位序号 */
+    /**
+     * 岗位序号
+     */
     @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
     private Long postId;
 
-    /** 岗位编码 */
+    /**
+     * 岗位编码
+     */
     @Excel(name = "岗位编码")
     private String postCode;
 
-    /** 岗位名称 */
+    /**
+     * 岗位名称
+     */
     @Excel(name = "岗位名称")
     private String postName;
 
-    /** 岗位排序 */
+    /**
+     * 岗位排序
+     */
     @Excel(name = "岗位排序")
     private String postSort;
 
-    /** 状态（0正常 1停用） */
+    /**
+     * 状态（0正常 1停用）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 用户是否存在此岗位标识 默认不存在 */
+    /**
+     * 用户是否存在此岗位标识 默认不存在
+     */
     private boolean flag = false;
 
-    public Long getPostId()
-    {
+    public Long getPostId() {
         return postId;
     }
 
-    public void setPostId(Long postId)
-    {
+    public void setPostId(Long postId) {
         this.postId = postId;
     }
 
     @NotBlank(message = "岗位编码不能为空")
     @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
-    public String getPostCode()
-    {
+    public String getPostCode() {
         return postCode;
     }
 
-    public void setPostCode(String postCode)
-    {
+    public void setPostCode(String postCode) {
         this.postCode = postCode;
     }
 
     @NotBlank(message = "岗位名称不能为空")
     @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
-    public String getPostName()
-    {
+    public String getPostName() {
         return postName;
     }
 
-    public void setPostName(String postName)
-    {
+    public void setPostName(String postName) {
         this.postName = postName;
     }
 
     @NotBlank(message = "显示顺序不能为空")
-    public String getPostSort()
-    {
+    public String getPostSort() {
         return postSort;
     }
 
-    public void setPostSort(String postSort)
-    {
+    public void setPostSort(String postSort) {
         this.postSort = postSort;
     }
 
-    public String getStatus()
-    {
+    public String getStatus() {
         return status;
     }
 
-    public void setStatus(String status)
-    {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-    public boolean isFlag()
-    {
+    public boolean isFlag() {
         return flag;
     }
 
-    public void setFlag(boolean flag)
-    {
+    public void setFlag(boolean flag) {
         this.flag = flag;
     }
-    
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("postId", getPostId())
-            .append("postCode", getPostCode())
-            .append("postName", getPostName())
-            .append("postSort", getPostSort())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("postId", getPostId())
+                .append("postCode", getPostCode())
+                .append("postName", getPostName())
+                .append("postSort", getPostSort())
+                .append("status", getStatus())
+                .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/SysRoleDept.java

@@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 角色和部门关联 sys_role_dept
- * 
+ *
  * @author ruoyi
  */
-public class SysRoleDept
-{
-    /** 角色ID */
+public class SysRoleDept {
+    /**
+     * 角色ID
+     */
     private Long roleId;
-    
-    /** 部门ID */
+
+    /**
+     * 部门ID
+     */
     private Long deptId;
 
-    public Long getRoleId()
-    {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Long roleId)
-    {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
-    {
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("deptId", getDeptId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("roleId", getRoleId())
+                .append("deptId", getDeptId())
+                .toString();
     }
 }

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

@@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 角色和菜单关联 sys_role_menu
- * 
+ *
  * @author ruoyi
  */
-public class SysRoleMenu
-{
-    /** 角色ID */
+public class SysRoleMenu {
+    /**
+     * 角色ID
+     */
     private Long roleId;
-    
-    /** 菜单ID */
+
+    /**
+     * 菜单ID
+     */
     private Long menuId;
 
-    public Long getRoleId()
-    {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Long roleId)
-    {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
-    public Long getMenuId()
-    {
+    public Long getMenuId() {
         return menuId;
     }
 
-    public void setMenuId(Long menuId)
-    {
+    public void setMenuId(Long menuId) {
         this.menuId = menuId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("menuId", getMenuId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("roleId", getRoleId())
+                .append("menuId", getMenuId())
+                .toString();
     }
 }

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

@@ -2,112 +2,111 @@ package com.ruoyi.system.domain;
 
 /**
  * 当前在线会话
- * 
+ *
  * @author ruoyi
  */
-public class SysUserOnline
-{
-    /** 会话编号 */
+public class SysUserOnline {
+    /**
+     * 会话编号
+     */
     private String tokenId;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     private String deptName;
 
-    /** 用户名称 */
+    /**
+     * 用户名称
+     */
     private String userName;
 
-    /** 登录IP地址 */
+    /**
+     * 登录IP地址
+     */
     private String ipaddr;
 
-    /** 登录地址 */
+    /**
+     * 登录地址
+     */
     private String loginLocation;
 
-    /** 浏览器类型 */
+    /**
+     * 浏览器类型
+     */
     private String browser;
 
-    /** 操作系统 */
+    /**
+     * 操作系统
+     */
     private String os;
 
-    /** 登录时间 */
+    /**
+     * 登录时间
+     */
     private Long loginTime;
 
-    public String getTokenId()
-    {
+    public String getTokenId() {
         return tokenId;
     }
 
-    public void setTokenId(String tokenId)
-    {
+    public void setTokenId(String tokenId) {
         this.tokenId = tokenId;
     }
 
-    public String getDeptName()
-    {
+    public String getDeptName() {
         return deptName;
     }
 
-    public void setDeptName(String deptName)
-    {
+    public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
 
-    public String getUserName()
-    {
+    public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName)
-    {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-    public String getIpaddr()
-    {
+    public String getIpaddr() {
         return ipaddr;
     }
 
-    public void setIpaddr(String ipaddr)
-    {
+    public void setIpaddr(String ipaddr) {
         this.ipaddr = ipaddr;
     }
 
-    public String getLoginLocation()
-    {
+    public String getLoginLocation() {
         return loginLocation;
     }
 
-    public void setLoginLocation(String loginLocation)
-    {
+    public void setLoginLocation(String loginLocation) {
         this.loginLocation = loginLocation;
     }
 
-    public String getBrowser()
-    {
+    public String getBrowser() {
         return browser;
     }
 
-    public void setBrowser(String browser)
-    {
+    public void setBrowser(String browser) {
         this.browser = browser;
     }
 
-    public String getOs()
-    {
+    public String getOs() {
         return os;
     }
 
-    public void setOs(String os)
-    {
+    public void setOs(String os) {
         this.os = os;
     }
 
-    public Long getLoginTime()
-    {
+    public Long getLoginTime() {
         return loginTime;
     }
 
-    public void setLoginTime(Long loginTime)
-    {
+    public void setLoginTime(Long loginTime) {
         this.loginTime = loginTime;
     }
 }

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

@@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 用户和岗位关联 sys_user_post
- * 
+ *
  * @author ruoyi
  */
-public class SysUserPost
-{
-    /** 用户ID */
+public class SysUserPost {
+    /**
+     * 用户ID
+     */
     private Long userId;
-    
-    /** 岗位ID */
+
+    /**
+     * 岗位ID
+     */
     private Long postId;
 
-    public Long getUserId()
-    {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId)
-    {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getPostId()
-    {
+    public Long getPostId() {
         return postId;
     }
 
-    public void setPostId(Long postId)
-    {
+    public void setPostId(Long postId) {
         this.postId = postId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("postId", getPostId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("postId", getPostId())
+                .toString();
     }
 }

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

@@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 用户和角色关联 sys_user_role
- * 
+ *
  * @author ruoyi
  */
-public class SysUserRole
-{
-    /** 用户ID */
+public class SysUserRole {
+    /**
+     * 用户ID
+     */
     private Long userId;
-    
-    /** 角色ID */
+
+    /**
+     * 角色ID
+     */
     private Long roleId;
 
-    public Long getUserId()
-    {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId)
-    {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getRoleId()
-    {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Long roleId)
-    {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("roleId", getRoleId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("roleId", getRoleId())
+                .toString();
     }
 }

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

@@ -0,0 +1,327 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 小程序用户对象 t_user_account_info
+ *
+ * @author wxy
+ * @date 2021-08-26
+ */
+public class TUserAccountInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * sessionKey
+     */
+    @Excel(name = "sessionKey")
+    private String sessionkey;
+
+    /**
+     * accessToken
+     */
+    @Excel(name = "accessToken")
+    private String accessToken;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "accessToken")
+    private String openId;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "accessToken")
+    private String unionId;
+
+    /**
+     * 昵称
+     */
+    @Excel(name = "昵称")
+    private String nickName;
+
+    /**
+     * 头像
+     */
+    @Excel(name = "头像")
+    private String avatar;
+
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号")
+    private String phone;
+
+    /**
+     * 生日
+     */
+    @Excel(name = "生日")
+    private String birthday;
+
+    /**
+     * 用户状态：0-冻结，1-正常
+     */
+    @Excel(name = "用户状态：0-冻结，1-正常")
+    private Long status;
+
+    /**
+     * 国家
+     */
+    @Excel(name = "国家")
+    private String country;
+
+    /**
+     * 省份
+     */
+    @Excel(name = "省份")
+    private String province;
+
+    /**
+     * 城市
+     */
+    @Excel(name = "城市")
+    private String city;
+
+    /**
+     * 地址
+     */
+    @Excel(name = "地址")
+    private String address;
+
+    /**
+     * 用户类型：0-未授权用户，1-消费者，2-商家
+     */
+    @Excel(name = "用户类型：0-未授权用户，1-消费者，2-商家")
+    private Long userType;
+
+    /**
+     * 绑定的管理员编号
+     */
+    @Excel(name = "绑定的管理员编号")
+    private Long adminId;
+
+    /**
+     * $column.columnComment
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绑定的管理员编号", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastLoginTime;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "绑定的管理员编号")
+    private String lastLoginIp;
+
+    /**
+     * $column.columnComment
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绑定的管理员编号", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmtTime;
+
+    /**
+     * $column.columnComment
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绑定的管理员编号", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmtUpdate;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setSessionkey(String sessionkey) {
+        this.sessionkey = sessionkey;
+    }
+
+    public String getSessionkey() {
+        return sessionkey;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setUserType(Long userType) {
+        this.userType = userType;
+    }
+
+    public Long getUserType() {
+        return userType;
+    }
+
+    public void setAdminId(Long adminId) {
+        this.adminId = adminId;
+    }
+
+    public Long getAdminId() {
+        return adminId;
+    }
+
+    public void setLastLoginTime(Date lastLoginTime) {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    public Date getLastLoginTime() {
+        return lastLoginTime;
+    }
+
+    public void setLastLoginIp(String lastLoginIp) {
+        this.lastLoginIp = lastLoginIp;
+    }
+
+    public String getLastLoginIp() {
+        return lastLoginIp;
+    }
+
+    public void setGmtTime(Date gmtTime) {
+        this.gmtTime = gmtTime;
+    }
+
+    public Date getGmtTime() {
+        return gmtTime;
+    }
+
+    public void setGmtUpdate(Date gmtUpdate) {
+        this.gmtUpdate = gmtUpdate;
+    }
+
+    public Date getGmtUpdate() {
+        return gmtUpdate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("sessionkey", getSessionkey())
+                .append("accessToken", getAccessToken())
+                .append("openId", getOpenId())
+                .append("unionId", getUnionId())
+                .append("nickName", getNickName())
+                .append("avatar", getAvatar())
+                .append("phone", getPhone())
+                .append("birthday", getBirthday())
+                .append("status", getStatus())
+                .append("country", getCountry())
+                .append("province", getProvince())
+                .append("city", getCity())
+                .append("address", getAddress())
+                .append("userType", getUserType())
+                .append("adminId", getAdminId())
+                .append("lastLoginTime", getLastLoginTime())
+                .append("lastLoginIp", getLastLoginIp())
+                .append("gmtTime", getGmtTime())
+                .append("gmtUpdate", getGmtUpdate())
+                .toString();
+    }
+}

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

@@ -0,0 +1,146 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 【请填写功能名称】对象 t_user_login_log
+ *
+ * @author wxy
+ * @date 2021-08-26
+ */
+public class TUserLoginLog extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 用户类型
+     */
+    @Excel(name = "用户类型")
+    private String userType;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "用户类型")
+    private Long userId;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "用户类型")
+    private String code;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "用户类型")
+    private String openId;
+
+    /**
+     * IP地址
+     */
+    @Excel(name = "IP地址")
+    private String ip;
+
+    /**
+     * $column.columnComment
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "IP地址", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmtTime;
+
+    /**
+     * $column.columnComment
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "IP地址", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmtUpdate;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setGmtTime(Date gmtTime) {
+        this.gmtTime = gmtTime;
+    }
+
+    public Date getGmtTime() {
+        return gmtTime;
+    }
+
+    public void setGmtUpdate(Date gmtUpdate) {
+        this.gmtUpdate = gmtUpdate;
+    }
+
+    public Date getGmtUpdate() {
+        return gmtUpdate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("userType", getUserType())
+                .append("userId", getUserId())
+                .append("code", getCode())
+                .append("openId", getOpenId())
+                .append("ip", getIp())
+                .append("gmtTime", getGmtTime())
+                .append("gmtUpdate", getGmtUpdate())
+                .toString();
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 类名: DeviceControlCMD
+ * 描述: 设备控制指令参数
+ * 时间: 2021-08-26,0026 18:54
+ * 开发人: admin
+ */
+@Data
+public class DeviceControlCMD {
+   private Long deviceId;
+    String deviceNum;
+    String cmd;
+}

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

@@ -19,263 +19,316 @@ import java.math.BigDecimal;
 
 /**
  * 设备对象 iot_device
- * 
+ *
  * @author kerwincui
  * @date 2021-05-06
  */
-public class IotDeviceListDto extends BaseEntity
-{
+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 categoryName;
 
-    /** 名称 */
+    /**
+     * 名称
+     */
     @Excel(name = "名称")
     private String deviceName;
 
-    /** 固件版本 */
+    /**
+     * 固件版本
+     */
     @Excel(name = "固件版本")
     private String firmwareVersion;
 
-    /** 用户 */
+    /**
+     * 用户
+     */
     @Excel(name = "用户")
     private String ownerId;
 
-    @Excel(name="用户昵称")
+    @Excel(name = "设备状态")
+    private String status;
+
+    @Excel(name = "用户昵称")
     private String nickName;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（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 */
+    /**
+     * 配网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;
 
+    @Excel(name = "备注")
+    private String  remark;
 
 
-    public void setDeviceId(Long deviceId) 
-    {
+    public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
-    public Long getDeviceId() 
-    {
+
+    public Long getDeviceId() {
         return deviceId;
     }
-    public void setDeviceNum(String deviceNum) 
-    {
+
+    public void setDeviceNum(String deviceNum) {
         this.deviceNum = deviceNum;
     }
-    public String getDeviceNum() 
-    {
+
+    public String getDeviceNum() {
         return deviceNum;
     }
-    public void setCategoryId(Long categoryId) 
-    {
+
+    public void setCategoryId(Long categoryId) {
         this.categoryId = categoryId;
     }
-    public Long getCategoryId() 
-    {
+
+    public Long getCategoryId() {
         return categoryId;
     }
-    public void setCategoryName(String categoryName)
-    {
+
+    public void setCategoryName(String categoryName) {
         this.categoryName = categoryName;
     }
-    public String getCategoryName()
-    {
+
+    public String getCategoryName() {
         return categoryName;
     }
-    public void setDeviceName(String deviceName) 
-    {
+
+    public void setDeviceName(String deviceName) {
         this.deviceName = deviceName;
     }
-    public String getDeviceName() 
-    {
+
+    public String getDeviceName() {
         return deviceName;
     }
-    public void setFirmwareVersion(String firmwareVersion) 
-    {
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setFirmwareVersion(String firmwareVersion) {
         this.firmwareVersion = firmwareVersion;
     }
-    public String getFirmwareVersion() 
-    {
+
+    public String getFirmwareVersion() {
         return firmwareVersion;
     }
-    public void setOwnerId(String ownerId) 
-    {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-    public String getOwnerId() 
-    {
+
+    public String getOwnerId() {
         return ownerId;
     }
-    public void setNickName(String nickName)
-    {
+
+    public void setNickName(String nickName) {
         this.nickName = nickName;
     }
-    public String getNickName()
-    {
+
+    public String getNickName() {
         return nickName;
     }
-    public void setDelFlag(String delFlag)
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public String getDelFlag()
-    {
+
+    public String getDelFlag() {
         return delFlag;
     }
 
-    public void setIsAlarm(Integer isAlarm)
-    {
+    public void setIsAlarm(Integer isAlarm) {
         this.isAlarm = isAlarm;
     }
-    public Integer getIsAlarm()
-    {
+
+    public Integer getIsAlarm() {
         return isAlarm;
     }
-    public void setIsRadar(Integer isRadar)
-    {
+
+    public void setIsRadar(Integer isRadar) {
         this.isRadar = isRadar;
     }
-    public Integer getIsRadar()
-    {
+
+    public Integer getIsRadar() {
         return isRadar;
     }
-    public void setIsRfControl(Integer isRfControl)
-    {
+
+    public void setIsRfControl(Integer isRfControl) {
         this.isRfControl = isRfControl;
     }
-    public Integer getIsRfControl()
-    {
+
+    public Integer getIsRfControl() {
         return isRfControl;
     }
-    public void setNetworkAddress(String networkAddress)
-    {
+
+    public void setNetworkAddress(String networkAddress) {
         this.networkAddress = networkAddress;
     }
-    public String getNetworkAddress()
-    {
+
+    public String getNetworkAddress() {
         return networkAddress;
     }
-    public void setNetworkIp(String networkIp)
-    {
+
+    public void setNetworkIp(String networkIp) {
         this.networkIp = networkIp;
     }
-    public String getNetworkIp()
-    {
+
+    public String getNetworkIp() {
         return networkIp;
     }
 
-    public void setRelayStatus(Integer relayStatus)
-    {
+    public void setRelayStatus(Integer relayStatus) {
         this.relayStatus = relayStatus;
     }
-    public Integer getRelayStatus()
-    {
+
+    public Integer getRelayStatus() {
         return relayStatus;
     }
-    public void setLightStatus(Integer lightStatus)
-    {
+
+    public void setLightStatus(Integer lightStatus) {
         this.lightStatus = lightStatus;
     }
-    public Integer getLightStatus()
-    {
+
+    public Integer getLightStatus() {
         return lightStatus;
     }
-    public void setIsOnline(Integer isOnline)
-    {
+
+    public void setIsOnline(Integer isOnline) {
         this.isOnline = isOnline;
     }
-    public Integer getIsOnline()
-    {
+
+    public Integer getIsOnline() {
         return isOnline;
     }
-    public void setDeviceTemperature(BigDecimal deviceTemperature)
-    {
+
+    public void setDeviceTemperature(BigDecimal deviceTemperature) {
         this.deviceTemperature = deviceTemperature;
     }
-    public BigDecimal getDeviceTemperature()
-    {
+
+    public BigDecimal getDeviceTemperature() {
         return deviceTemperature;
     }
-    public void setRssi(Integer rssi)
-    {
+
+    public void setRssi(Integer rssi) {
         this.rssi = rssi;
     }
-    public Integer getRssi()
-    {
+
+    public Integer getRssi() {
         return rssi;
     }
 
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deviceId", getDeviceId())
-            .append("deviceNum", getDeviceNum())
-            .append("categoryId", getCategoryId())
-            .append("categoryName", getCategoryName())
-            .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())
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("deviceId", getDeviceId())
+                .append("deviceNum", getDeviceNum())
+                .append("categoryId", getCategoryId())
+                .append("categoryName", getCategoryName())
+                .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())
@@ -286,6 +339,6 @@ public class IotDeviceListDto extends BaseEntity
                 .append("isOnline", getIsOnline())
                 .append("deviceTemperature", getDeviceTemperature())
                 .append("rssid", getRssi())
-            .toString();
+                .toString();
     }
 }

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

@@ -2,11 +2,10 @@ package com.ruoyi.system.domain.vo;
 
 /**
  * 路由显示信息
- * 
+ *
  * @author ruoyi
  */
-public class MetaVo
-{
+public class MetaVo {
     /**
      * 设置该路由在侧边栏和面包屑中展示的名字
      */
@@ -22,50 +21,41 @@ public class MetaVo
      */
     private boolean noCache;
 
-    public MetaVo()
-    {
+    public MetaVo() {
     }
 
-    public MetaVo(String title, String icon)
-    {
+    public MetaVo(String title, String icon) {
         this.title = title;
         this.icon = icon;
     }
 
-    public MetaVo(String title, String icon, boolean noCache)
-    {
+    public MetaVo(String title, String icon, boolean noCache) {
         this.title = title;
         this.icon = icon;
         this.noCache = noCache;
     }
 
-    public boolean isNoCache()
-    {
+    public boolean isNoCache() {
         return noCache;
     }
 
-    public void setNoCache(boolean noCache)
-    {
+    public void setNoCache(boolean noCache) {
         this.noCache = noCache;
     }
 
-    public String getTitle()
-    {
+    public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title)
-    {
+    public void setTitle(String title) {
         this.title = title;
     }
 
-    public String getIcon()
-    {
+    public String getIcon() {
         return icon;
     }
 
-    public void setIcon(String icon)
-    {
+    public void setIcon(String icon) {
         this.icon = icon;
     }
 }

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

@@ -1,16 +1,16 @@
 package com.ruoyi.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.util.List;
 
 /**
  * 路由配置信息
- * 
+ *
  * @author ruoyi
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
-{
+public class RouterVo {
     /**
      * 路由名字
      */
@@ -51,83 +51,67 @@ public class RouterVo
      */
     private List<RouterVo> children;
 
-    public String getName()
-    {
+    public String getName() {
         return name;
     }
 
-    public void setName(String name)
-    {
+    public void setName(String name) {
         this.name = name;
     }
 
-    public String getPath()
-    {
+    public String getPath() {
         return path;
     }
 
-    public void setPath(String path)
-    {
+    public void setPath(String path) {
         this.path = path;
     }
 
-    public boolean getHidden()
-    {
+    public boolean getHidden() {
         return hidden;
     }
 
-    public void setHidden(boolean hidden)
-    {
+    public void setHidden(boolean hidden) {
         this.hidden = hidden;
     }
 
-    public String getRedirect()
-    {
+    public String getRedirect() {
         return redirect;
     }
 
-    public void setRedirect(String redirect)
-    {
+    public void setRedirect(String redirect) {
         this.redirect = redirect;
     }
 
-    public String getComponent()
-    {
+    public String getComponent() {
         return component;
     }
 
-    public void setComponent(String component)
-    {
+    public void setComponent(String component) {
         this.component = component;
     }
 
-    public Boolean getAlwaysShow()
-    {
+    public Boolean getAlwaysShow() {
         return alwaysShow;
     }
 
-    public void setAlwaysShow(Boolean alwaysShow)
-    {
+    public void setAlwaysShow(Boolean alwaysShow) {
         this.alwaysShow = alwaysShow;
     }
 
-    public MetaVo getMeta()
-    {
+    public MetaVo getMeta() {
         return meta;
     }
 
-    public void setMeta(MetaVo meta)
-    {
+    public void setMeta(MetaVo meta) {
         this.meta = meta;
     }
 
-    public List<RouterVo> getChildren()
-    {
+    public List<RouterVo> getChildren() {
         return children;
     }
 
-    public void setChildren(List<RouterVo> children)
-    {
+    public void setChildren(List<RouterVo> children) {
         this.children = children;
     }
 }