设备状态和设备状态列表首页开发

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -1018,10 +1018,23 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * 相机状态修改
      */
     public void cameraBlockUp() {
+        long time=60000L;
         //当前时间戳
         long dades = System.currentTimeMillis();
+        //字典中设置的值
+        List<SysDictData> heartIntervalTime = dictDataMapper.selectDictDataByType("heart_interval_time");
+        List<SysDictData> triggerWarningFrequency = dictDataMapper.selectDictDataByType("trigger_warning_frequency");
+        if (!ObjectUtils.isEmpty(heartIntervalTime)){
+            time=time*Long.valueOf(heartIntervalTime.get(0).getDictValue());
+        }
+        if (!ObjectUtils.isEmpty(triggerWarningFrequency)){
+            time=time*Long.valueOf(triggerWarningFrequency.get(0).getDictValue());
+        }
+        if (ObjectUtils.isEmpty(heartIntervalTime)||ObjectUtils.isEmpty(triggerWarningFrequency)){
+            time=time*5*3;
+        }
         //当前时间5分钟之前的时间戳
-        long time2 = dades - 300000L;
+        long time2 = dades - (time);
         LambdaQueryWrapper<MqLog> mqLog = new LambdaQueryWrapper<>();
         mqLog.ge(MqLog::getCreateTime, new Date(time2));
         mqLog.le(MqLog::getCreateTime, new Date(dades));