Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

@@ -1751,6 +1751,9 @@ private VideoController videoController;
                 continue;
             }
             JSONObject data = (JSONObject) result.get("data");//属性全部值
+            if (data==null){
+                continue;
+            }
             String value = data.get("value").toString();//属性值
             if ("1".equals(value)){//机箱门状态为开
                 String cacheMapValue = redisCache.getCacheMapValue(DOORSTATUS, device.getIotDeviceId());//查询缓存
@@ -1792,7 +1795,7 @@ private VideoController videoController;
     }
     //设备箱机箱门状态采集
     //@PostMapping("/integratedCabinetAir")
-    @Scheduled(cron = "40 * * * * ?")
+    @Scheduled(fixedRate = 30000)
     @Transactional()
     public AjaxResult equipmentBoxDoor() throws IOException, HttpException {
         DcDevice dcDevice = new DcDevice();
@@ -1806,7 +1809,13 @@ private VideoController videoController;
                 continue;
             }
             JSONObject data = (JSONObject) result.get("data");//属性全部值
+            if (data==null){
+                continue;
+            }
             JSONObject value = (JSONObject) data.get("value");
+            if (value==null){
+                continue;
+            }
             String doorStatus = value.get("door_status").toString();//属性值
             if ("1".equals(doorStatus)){//机箱门状态为开
                 String cacheMapValue = redisCache.getCacheMapValue(DOORSTATUS, device.getIotDeviceId());//查询缓存
@@ -1844,7 +1853,7 @@ private VideoController videoController;
                 }
             }
         }
-        return null;
+        return AjaxResult.success();
     }
 
     @GetMapping("/dcDoorList")