1-21 ------

xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/redischannel/consumer/DeviceStatusConsumer.java

@@ -73,6 +73,8 @@ public class DeviceStatusConsumer {
                 device.setStatus(1);
                 device.setTenantId(1L);
                 device.setTenantName("admin");
+                device.setGroupId(0L);
+
                 deviceService.insertDeviceTest(device);
                 device = deviceService.selectDeviceBySerialNumber(bo.getSerialNumber());
             }
@@ -84,12 +86,22 @@ public class DeviceStatusConsumer {
                 if (containsKey && !isOnline) {
                     //如果session存在，但数据库状态不在线，则以session为准
                     bo.setStatus(DeviceStatus.ONLINE);
+                    device.setDelFlag("0");
                 }
                 if (!containsKey && isOnline) {
                     bo.setStatus(DeviceStatus.OFFLINE);
+
+//                    判断下 项目id
+                    if (device.getGroupId().equals(0L) || device.getGroupId() == null) {
+                        //设置删除状态 todo
+                        device.setDelFlag("2");
+                    }
+
+
                 }
             }
             /*更新设备状态*/
+
             deviceCache.updateDeviceStatusCache(bo, device);
             //处理影子模式值
             this.handlerShadow(device, bo.getStatus());