Merge branch 'dev' into 'master'

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

@@ -68,6 +68,30 @@ public class DeviceInfoPO implements Serializable {
     @TableField("locked")
     private Integer locked;
 
+    /**
+     * 省代码
+     */
+    @TableField("province_code")
+    private String provinceCode;
+
+    /**
+     * 市代码
+     */
+    @TableField("city_code")
+    private String cityCode;
+
+    /**
+     * 区代码
+     */
+    @TableField("area_code")
+    private String areaCode;
+
+    /**
+     * 门店编号
+     */
+    @TableField("store_num")
+    private String storeNum;
+
     /**
      * 创建时间
      */
@@ -80,5 +104,29 @@ public class DeviceInfoPO implements Serializable {
     @TableField("update_time")
     private LocalDateTime updateTime;
 
+    /**
+     * 最近一次上线时间
+     */
+    @TableField("last_online_time")
+    private LocalDateTime lastOnlineTime;
+
+    /**
+     * 最近一次下线时间
+     */
+    @TableField("last_offline_time")
+    private LocalDateTime lastOfflineTime;
+
+    /**
+     * 首单时间
+     */
+    @TableField("first_order_time")
+    private LocalDateTime firstOrderTime;
+
+    /**
+     * 首单订单号
+     */
+    @TableField("first_order_num")
+    private String firstOrderNum;
+
 
 }

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

@@ -46,6 +46,11 @@ public class DeviceStatusMQ implements NatsMQProcess{
 			//如果数据库不一致则更新
 			if(null != deviceInfoPO && !bean.getOnline().equals(deviceInfoPO.getOnline())){
 				deviceInfoPO.setOnline(null == bean.getOnline()?0:bean.getOnline());
+				if(deviceInfoPO.getOnline().intValue()==0){
+					deviceInfoPO.setLastOfflineTime(LocalDateTime.now());
+				}else{
+					deviceInfoPO.setLastOnlineTime(LocalDateTime.now());
+				}
 				deviceInfoPO.setUpdateTime(LocalDateTime.now());
 				deviceService.updateById(deviceInfoPO);
 			}