feat: 独立部署设备消息过滤

server-common/src/main/java/com/makeit/enums/redis/RedisConst.java

@@ -101,6 +101,8 @@ public class RedisConst {
     public static final String ALARM_CONFIG_ORG_ID = "alarm:config:org:id:";
     public static final String ALARM_CONFIG_ORG_ID = "alarm:config:org:id:";
     public static final String PLAT_IOT_DEVICE_PREFIX = "plat:iot:device:";
     public static final String PLAT_IOT_DEVICE_PREFIX = "plat:iot:device:";
 
 
+    public static final String PLAT_OWN_IOT_DEVICE_ID = "plat:own:iot:device:id:";
+
     public static final String ELDER_DAY_DURATION_PREFIX = "plat:day:duration:device:";
     public static final String ELDER_DAY_DURATION_PREFIX = "plat:day:duration:device:";
 
 
     public static final String LOCK_ALARM = "lock:alarm:device:id:";
     public static final String LOCK_ALARM = "lock:alarm:device:id:";

server-service/src/main/java/com/makeit/utils/DeviceCacheUtil.java

@@ -43,11 +43,16 @@ public class DeviceCacheUtil implements ApplicationRunner {
         PlatTenant platTenant = platTenantService.getById(platDevice.getTenantId());
         PlatTenant platTenant = platTenantService.getById(platDevice.getTenantId());
         if(StringUtils.equals(platDevice.getStatus(),DeviceState.online.getValue())) {
         if(StringUtils.equals(platDevice.getStatus(),DeviceState.online.getValue())) {
             RedisUtil.set(RedisConst.PLAT_IOT_DEVICE_PREFIX + platDevice.getOriDeviceId()+":"+platTenant.getIotOrgId(), platDevice);
             RedisUtil.set(RedisConst.PLAT_IOT_DEVICE_PREFIX + platDevice.getOriDeviceId()+":"+platTenant.getIotOrgId(), platDevice);
+            RedisUtil.set(RedisConst.PLAT_OWN_IOT_DEVICE_ID + platDevice.getOriDeviceId(), platDevice);
         }else {
         }else {
             String key = RedisConst.PLAT_IOT_DEVICE_PREFIX + platDevice.getOriDeviceId()+":"+platTenant.getIotOrgId();
             String key = RedisConst.PLAT_IOT_DEVICE_PREFIX + platDevice.getOriDeviceId()+":"+platTenant.getIotOrgId();
             if(RedisUtil.exist(key)){
             if(RedisUtil.exist(key)){
                 RedisUtil.delete(RedisConst.PLAT_IOT_DEVICE_PREFIX + platDevice.getOriDeviceId()+":"+platTenant.getIotOrgId());
                 RedisUtil.delete(RedisConst.PLAT_IOT_DEVICE_PREFIX + platDevice.getOriDeviceId()+":"+platTenant.getIotOrgId());
             }
             }
+            String key1 = RedisConst.PLAT_OWN_IOT_DEVICE_ID + platDevice.getOriDeviceId();
+            if(RedisUtil.exist(key1)){
+                RedisUtil.delete(key1);
+            }
         }
         }
     }
     }
 
 

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -115,6 +115,12 @@ public class PushCallback implements MqttCallbackExtended {
             // 解析数据
             // 解析数据
             DeviceInfo device = JSON.parseObject(payload, DeviceInfo.class);
             DeviceInfo device = JSON.parseObject(payload, DeviceInfo.class);
 
 
+            // 独立部署的服务过滤出平台自己的设备消息
+            String key = RedisConst.PLAT_OWN_IOT_DEVICE_ID + device.getDeviceId();
+            if (!RedisUtil.exist(key)) {
+                return;
+            }
+
             syncProperties(device);
             syncProperties(device);
 
 
             checkAlarm(device);
             checkAlarm(device);