Merge branch 'dev' into 'master'

src/main/java/com/shadow/iot/entity/DeviceInfoPO.java

@@ -68,6 +68,12 @@ public class DeviceInfoPO implements Serializable {
     @TableField("locked")
     private Integer locked;
 
+    /**
+     * 是否C端专享：0否；1是
+     */
+    @TableField("is_client")
+    private Integer isClient;
+
     /**
      * 省代码
      */
@@ -110,6 +116,12 @@ public class DeviceInfoPO implements Serializable {
     @TableField("last_online_time")
     private LocalDateTime lastOnlineTime;
 
+    /**
+     * 最近一次上线ip地址
+     */
+    @TableField("last_online_ip")
+    private String lastOnlineIp;
+
     /**
      * 最近一次下线时间
      */

src/main/java/com/shadow/mq/nats/consumer/process/DeviceStatusMQ.java

@@ -49,6 +49,7 @@ public class DeviceStatusMQ implements NatsMQProcess{
 				if(deviceInfoPO.getOnline().intValue()==0){
 					deviceInfoPO.setLastOfflineTime(LocalDateTime.now());
 				}else{
+					deviceInfoPO.setLastOnlineIp(bean.getIp());
 					deviceInfoPO.setLastOnlineTime(LocalDateTime.now());
 				}
 				deviceInfoPO.setUpdateTime(LocalDateTime.now());