销毁流新逻辑

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -3,6 +3,7 @@ package com.ozs.utils;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
@@ -15,11 +16,13 @@ import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.HttpClientUtil;
 import com.ozs.common.utils.http.HttpUtils;
+import com.ozs.entity.BaseCameraManagement;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.MsgHeartbeatAlarmMessage;
 import com.ozs.entity.vo.CamerasVo;
 import com.ozs.entity.vo.PlaybackVo;
 import com.ozs.framework.config.ServerConfig;
+import com.ozs.service.BaseCameraManagementService;
 import com.ozs.service.BaseTerminalService;
 import com.ozs.service.MsgHeartbeatAlarmMessageService;
 import com.ozs.system.mapper.SysDictDataMapper;
@@ -116,6 +119,8 @@ public class CameraUtil {
     private ISysDictTypeService dictTypeService;
     @Autowired
     private RtspToMP4 rtspToMP4;
+    @Autowired
+    private BaseCameraManagementService baseCameraManagementService;
 
     private Map<String, Process> map = new HashMap<>();
 
@@ -852,7 +857,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         }
 
         executor.shutdown();
-        return bakUrlRtsp + "/live/" + code+".flv";
+        return bakUrlRtsp + "/live/" + code + ".flv";
     }
 
 
@@ -1271,7 +1276,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                                 log.info("hostStopStream---111--------------->");
                                 hostStopStream(pathValue);
                             }
-                        }else {
+                        } else {
                             log.info("hostStopStream---222--------------->");
                             hostStopStream(pathValue);
                         }
@@ -1280,4 +1285,58 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             }
         }
     }
+
+    public void removePlayFlv(Integer lineDir, Integer currentMile, Integer visualDistance) {
+        LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
+        if (lineDir == 1) {
+            wrapper.gt(BaseCameraManagement::getEndMile, currentMile + visualDistance)
+                    .in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+        } else if (lineDir == 2) {
+            wrapper.lt(BaseCameraManagement::getBeginMile, currentMile - visualDistance)
+                    .in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+        }
+        wrapper.eq(BaseCameraManagement::getEnableOrNot, 1);
+        //获取应该注销的相机
+        List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+        ArrayList<String> codeList = new ArrayList<>();
+        if (!ObjectUtils.isEmpty(list)) {
+            for (BaseCameraManagement baseCameraManagement : list) {
+                codeList.add(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel());
+            }
+        }
+
+
+        String data = HttpUtils.sendGet(webUrl + "/api/summary");
+        log.info("data------------------>" + data);
+        ArrayList<String> arrayList = new ArrayList();
+        if (StringUtils.isNotEmpty(data)) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            log.info("jsonObject------------------>" + jsonObject);
+            JSONArray streamArray = jsonObject.getJSONArray("Streams");
+            log.info("streamArray------------------>" + streamArray);
+            if (!ObjectUtils.isEmpty(streamArray)) {
+                for (int i = 0; i < streamArray.size(); i++) {
+                    JSONObject subObj = streamArray.getJSONObject(i);
+                    log.info("subObj------------------>" + subObj);
+                    String subValue = subObj.getString("Subscribers");
+                    String pathValue = subObj.getString("Path");
+                    //从缓存取出预拉的流的集合
+                    log.info("subValue------------------>" + subValue);
+                    log.info("pathValue------------------>" + pathValue);
+                    //判断主码流是否订阅者是2
+                    if (subValue.equals("0")) {
+                        arrayList.add(pathValue);
+                    }
+                }
+            }
+        }
+        if (!ObjectUtils.isEmpty(codeList) && !ObjectUtils.isEmpty(arrayList)) {
+            codeList.retainAll(arrayList);
+            if (!ObjectUtils.isEmpty(codeList)) {
+                for (String pathValue : codeList) {
+                    hostStopStream(pathValue);
+                }
+            }
+        }
+    }
 }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -684,7 +684,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + cameraCode + "】不存在");
         }
-        return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
+        return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, "channel"));
     }
 
     @GetMapping("/api/invite/{cameraCode}")
@@ -757,7 +757,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + vo.getCameraCode() + "】不存在");
         }
-        return new AjaxResult(200, "ok", CameraUtil.getRecordList(one.getCameraCode(), vo.getStartTime(), vo.getEntTime(),one.getChannel()));
+        return new AjaxResult(200, "ok", CameraUtil.getRecordList(one.getCameraCode(), vo.getStartTime(), vo.getEntTime(),"record"));
     }
 
     @GetMapping("/api/recordsList")

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -659,7 +659,11 @@ public class GeoHazardMonitorTokenController {
                     } else {
                         queryWrapper2.in(MsgAlarm::getAlarmId, collect);
                     }
-                    queryWrapper2.orderByAsc(MsgAlarm::getAlarmMile);
+                    if (heartbeatVo.getLineDir() == 1) {
+                        queryWrapper2.orderByAsc(MsgAlarm::getAlarmMile);
+                    } else if (heartbeatVo.getLineDir() == 2) {
+                        queryWrapper2.orderByDesc(MsgAlarm::getAlarmMile);
+                    }
                     List<MsgAlarm> list = msgAlarmService.list(queryWrapper2);
                     log.info("--------List<MsgAlarm>--------" + list);
                     //有报警信息的时候
@@ -798,7 +802,7 @@ public class GeoHazardMonitorTokenController {
                             if (!ObjectUtils.isEmpty(baseRouteMassageList)) {
                                 for (BaseRouteMassage baseRouteMassage : baseRouteMassageList) {
                                     if (heartbeatVo.getLineDir() == 1) {
-                                        if (baseRouteMassage.getMileagePosition() - heartbeatVo.getCurrentMile() <= 1500 &&baseRouteMassage.getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
+                                        if (baseRouteMassage.getMileagePosition() - heartbeatVo.getCurrentMile() <= 1500 && baseRouteMassage.getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
                                             respHeartbeatVo.setRouteTrack(baseRouteMassage.getRouteStationTrack().toString());
                                             respHeartbeatVo.setStationCode(baseRouteMassage.getStationCode());
                                             break;
@@ -817,7 +821,7 @@ public class GeoHazardMonitorTokenController {
                                         }
                                     }
                                 }
-                            }else {
+                            } else {
                                 respHeartbeatVo.setRouteTrack("");
                                 respHeartbeatVo.setStationCode("");
                             }
@@ -873,32 +877,32 @@ public class GeoHazardMonitorTokenController {
 //                                    //添加心跳相机日志信息
 //                                    int add1 = terminalHeartbeatLogService.add(baseList.get(o).getCameraCode(), baseList.get(o).getChannel());
 //                                    log.info("-----add1----" + add1);
-                                 if (i>0) {
-                                     int minDifference = Integer.MAX_VALUE;
-                                     String code = null;
-                                     String channel = null;
-                                     for (BaseCameraManagement baseCameraManagement : baseList) {
-                                         log.info("------------baseCameraManagement.getInstallMile()-------" + baseCameraManagement.getInstallMile());
-                                         log.info("------------list.get(0).getAlarmMile()-------" + list.get(0).getAlarmMile());
-                                         int difference = Math.abs(baseCameraManagement.getInstallMile() - list.get(0).getAlarmMile());
-                                         log.info("------------difference-------" + difference);
-                                         log.info("------------minDifference-------" + minDifference);
-                                         if (difference < minDifference) {
-                                             minDifference = difference;
-                                             log.info("------------minDifference变更-------" + minDifference);
-                                             code = baseCameraManagement.getCameraCode();
-                                             log.info("------------code-------" + code);
-                                             channel = baseCameraManagement.getChannel();
-                                             log.info("------------channel-------" + channel);
-                                         }
-                                     }
-                                     playFlv1 = cameraUtil.heartbeatgetPlayFlv(code, channel, type);
-                                 }
+                                if (i > 0) {
+                                    int minDifference = Integer.MAX_VALUE;
+                                    String code = null;
+                                    String channel = null;
+                                    for (BaseCameraManagement baseCameraManagement : baseList) {
+                                        log.info("------------baseCameraManagement.getInstallMile()-------" + baseCameraManagement.getInstallMile());
+                                        log.info("------------list.get(0).getAlarmMile()-------" + list.get(0).getAlarmMile());
+                                        int difference = Math.abs(baseCameraManagement.getInstallMile() - list.get(0).getAlarmMile());
+                                        log.info("------------difference-------" + difference);
+                                        log.info("------------minDifference-------" + minDifference);
+                                        if (difference < minDifference) {
+                                            minDifference = difference;
+                                            log.info("------------minDifference变更-------" + minDifference);
+                                            code = baseCameraManagement.getCameraCode();
+                                            log.info("------------code-------" + code);
+                                            channel = baseCameraManagement.getChannel();
+                                            log.info("------------channel-------" + channel);
+                                        }
+                                    }
+                                    playFlv1 = cameraUtil.heartbeatgetPlayFlv(code, channel, type);
+                                }
                                 AlarmListVo alarmListVo = new AlarmListVo();
                                 //alarmList对象
                                 if (playFlv1 != null) {
                                     alarmListVo.setCameraStream(playFlv1);
-                                }else {
+                                } else {
                                     alarmListVo.setCameraStream("");
                                 }
                                 alarmListVo.setCameraCode(baseList.get(0).getCameraCode());
@@ -1005,18 +1009,18 @@ public class GeoHazardMonitorTokenController {
 //                            int add2 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
 //                            log.info("-----add2----" + add2);
                         }
-                        ArrayList<String> list3 = new ArrayList<>();
+//                        ArrayList<String> list3 = new ArrayList<>();
                         //添加缓存
 //                        List<String> stringList = redisCache.getCacheObject("heartbeat");
-                        for (BaseCameraManagement baseCameraManagement : list1) {
-                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
-                            list3.add(code);
-                        }
+//                        for (BaseCameraManagement baseCameraManagement : list1) {
+//                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
+//                            list3.add(code);
+//                        }
 //                        if (!ObjectUtils.isEmpty(stringList)) {
 //                            list3.addAll(stringList);
 //                        }
-                        log.info("--------------heartbeat--------------:" + list3);
-                        redisCache.setCacheObject("heartbeat", list3);
+//                        log.info("--------------heartbeat--------------:" + list3);
+//                        redisCache.setCacheObject("heartbeat", list3);
                         //获取缓冲
                         //List<String> heartbeat = redisCache.getCacheObject("heartbeat");
                         //log.info("--------------heartbeat111--------------:" + heartbeat);
@@ -1039,13 +1043,16 @@ public class GeoHazardMonitorTokenController {
                         //            String[] parts = str.split("/");
                         //            log.info("--------------parts--------------:" + parts);
                         //            if (parts.length == 2) {
+//                        CompletableFuture.runAsync(() -> {
+//                            try {
+//                                TimeUnit.SECONDS.sleep(2);
+//                            } catch (InterruptedException e) {
+//                                e.printStackTrace();
+//                            }
+//                            cameraUtil.heartbeatGetPlayFlv();
+//                        });
                         CompletableFuture.runAsync(() -> {
-                            try {
-                                TimeUnit.SECONDS.sleep(2);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                            cameraUtil.heartbeatGetPlayFlv();
+                            cameraUtil.removePlayFlv(heartbeatVo.getLineDir(), heartbeatVo.getCurrentMile(), heartbeatVo.getVisualDistance());
                         });
                         //            }
                         //        }
@@ -1097,7 +1104,7 @@ public class GeoHazardMonitorTokenController {
                                         }
                                     }
                                 }
-                            }else {
+                            } else {
                                 respHeartbeatVo.setRouteTrack("");
                                 respHeartbeatVo.setStationCode("");
                             }
@@ -1122,14 +1129,14 @@ public class GeoHazardMonitorTokenController {
 //                                int add3 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
 //                                log.info("-----add3----" + add3);
                             }
-                            ArrayList<String> list3 = new ArrayList<>();
-                            //添加缓存
-                            for (BaseCameraManagement baseCameraManagement : list1) {
-                                String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
-                                list3.add(code);
-                            }
-                            log.info("--------------heartbeat--------------:" + list3);
-                            redisCache.setCacheObject("heartbeat", list3);
+//                            ArrayList<String> list3 = new ArrayList<>();
+//                            //添加缓存
+//                            for (BaseCameraManagement baseCameraManagement : list1) {
+//                                String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
+//                                list3.add(code);
+//                            }
+//                            log.info("--------------heartbeat--------------:" + list3);
+//                            redisCache.setCacheObject("heartbeat", list3);
                             //获取缓冲
                             //List<String> heartbeat = redisCache.getCacheObject("heartbeat");
                             //log.info("--------------heartbeat111--------------:" + heartbeat);
@@ -1157,13 +1164,16 @@ public class GeoHazardMonitorTokenController {
                             //        }
                             //    }
                             //}
+//                            CompletableFuture.runAsync(() -> {
+//                                try {
+//                                    TimeUnit.SECONDS.sleep(2);
+//                                } catch (InterruptedException e) {
+//                                    e.printStackTrace();
+//                                }
+//                                cameraUtil.heartbeatGetPlayFlv();
+//                            });
                             CompletableFuture.runAsync(() -> {
-                                try {
-                                    TimeUnit.SECONDS.sleep(2);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                                cameraUtil.heartbeatGetPlayFlv();
+                                cameraUtil.removePlayFlv(heartbeatVo.getLineDir(), heartbeatVo.getCurrentMile(), heartbeatVo.getVisualDistance());
                             });
                         } else {
                             log.info("-------------->>已进入拉一路视频");
@@ -1174,14 +1184,14 @@ public class GeoHazardMonitorTokenController {
 //                                int add4 = terminalHeartbeatLogService.add(list1.get(i).getCameraCode(), list1.get(i).getChannel());
 //                                log.info("-----add4----" + add4);
                             }
-                            ArrayList<String> list3 = new ArrayList<>();
-                            //添加缓存
-                            for (BaseCameraManagement baseCameraManagement : list1) {
-                                String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
-                                list3.add(code);
-                            }
-                            log.info("--------------heartbeat--------------:" + list3);
-                            redisCache.setCacheObject("heartbeat", list3);
+//                            ArrayList<String> list3 = new ArrayList<>();
+//                            //添加缓存
+//                            for (BaseCameraManagement baseCameraManagement : list1) {
+//                                String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
+//                                list3.add(code);
+//                            }
+//                            log.info("--------------heartbeat--------------:" + list3);
+//                            redisCache.setCacheObject("heartbeat", list3);
                             //获取缓冲
                             //List<String> heartbeat = redisCache.getCacheObject("heartbeat");
                             //log.info("--------------heartbeat111--------------:" + heartbeat);
@@ -1216,13 +1226,16 @@ public class GeoHazardMonitorTokenController {
                             //        }
                             //    }
                             //}
+//                            CompletableFuture.runAsync(() -> {
+//                                try {
+//                                    TimeUnit.SECONDS.sleep(2);
+//                                } catch (InterruptedException e) {
+//                                    e.printStackTrace();
+//                                }
+//                                cameraUtil.heartbeatGetPlayFlv();
+//                            });
                             CompletableFuture.runAsync(() -> {
-                                try {
-                                    TimeUnit.SECONDS.sleep(2);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                                cameraUtil.heartbeatGetPlayFlv();
+                                cameraUtil.removePlayFlv(heartbeatVo.getLineDir(),heartbeatVo.getCurrentMile(),heartbeatVo.getVisualDistance());
                             });
                         }
                         twoMap.put("currentStream", playFlv);
@@ -1280,7 +1293,7 @@ public class GeoHazardMonitorTokenController {
                                     }
                                 }
                             }
-                        }else {
+                        } else {
                             respHeartbeatVo.setRouteTrack("");
                             respHeartbeatVo.setStationCode("");
                         }
@@ -1305,14 +1318,14 @@ public class GeoHazardMonitorTokenController {
 //                            int add5 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
 //                            log.info("-----add5----" + add5);
                         }
-                        ArrayList<String> list3 = new ArrayList<>();
-                        //添加缓存
-                        for (BaseCameraManagement baseCameraManagement : list1) {
-                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
-                            list3.add(code);
-                        }
-                        log.info("--------------heartbeat--------------:" + list3);
-                        redisCache.setCacheObject("heartbeat", list3);
+//                        ArrayList<String> list3 = new ArrayList<>();
+//                        //添加缓存
+//                        for (BaseCameraManagement baseCameraManagement : list1) {
+//                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
+//                            list3.add(code);
+//                        }
+//                        log.info("--------------heartbeat--------------:" + list3);
+//                        redisCache.setCacheObject("heartbeat", list3);
 //                        //获取缓冲
 //                        List<String> heartbeat = redisCache.getCacheObject("heartbeat");
 //                        log.info("--------------heartbeat111--------------:" + heartbeat);
@@ -1347,13 +1360,16 @@ public class GeoHazardMonitorTokenController {
 //                                }
 //                            }
 //                        }
+//                        CompletableFuture.runAsync(() -> {
+//                            try {
+//                                TimeUnit.SECONDS.sleep(2);
+//                            } catch (InterruptedException e) {
+//                                e.printStackTrace();
+//                            }
+//                            cameraUtil.heartbeatGetPlayFlv();
+//                        });
                         CompletableFuture.runAsync(() -> {
-                            try {
-                                TimeUnit.SECONDS.sleep(2);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                            cameraUtil.heartbeatGetPlayFlv();
+                            cameraUtil.removePlayFlv(heartbeatVo.getLineDir(),heartbeatVo.getCurrentMile(),heartbeatVo.getVisualDistance());
                         });
 //                        List<String> finalCodeList2 = codeList;
 //                        CompletableFuture.runAsync(() -> {
@@ -1379,14 +1395,14 @@ public class GeoHazardMonitorTokenController {
 //                            int add6 = terminalHeartbeatLogService.add(list1.get(i).getCameraCode(), list1.get(i).getChannel());
 //                            log.info("-----add6----" + add6);
                         }
-                        ArrayList<String> list3 = new ArrayList<>();
-                        //添加缓存
-                        for (BaseCameraManagement baseCameraManagement : list1) {
-                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
-                            list3.add(code);
-                        }
-                        log.info("--------------heartbeat--------------:" + list3);
-                        redisCache.setCacheObject("heartbeat", list3);
+//                        ArrayList<String> list3 = new ArrayList<>();
+//                        //添加缓存
+//                        for (BaseCameraManagement baseCameraManagement : list1) {
+//                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
+//                            list3.add(code);
+//                        }
+//                        log.info("--------------heartbeat--------------:" + list3);
+//                        redisCache.setCacheObject("heartbeat", list3);
 //                        //获取缓冲
 //                        List<String> heartbeat = redisCache.getCacheObject("heartbeat");
 //                        log.info("--------------heartbeat111--------------:" + heartbeat);
@@ -1421,13 +1437,16 @@ public class GeoHazardMonitorTokenController {
 //                                }
 //                            }
 //                        }
+//                        CompletableFuture.runAsync(() -> {
+//                            try {
+//                                TimeUnit.SECONDS.sleep(2);
+//                            } catch (InterruptedException e) {
+//                                e.printStackTrace();
+//                            }
+//                            cameraUtil.heartbeatGetPlayFlv();
+//                        });
                         CompletableFuture.runAsync(() -> {
-                            try {
-                                TimeUnit.SECONDS.sleep(2);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                            cameraUtil.heartbeatGetPlayFlv();
+                            cameraUtil.removePlayFlv(heartbeatVo.getLineDir(),heartbeatVo.getCurrentMile(),heartbeatVo.getVisualDistance());
                         });
                     }
                     twoMap.put("currentStream", playFlv);
@@ -1457,7 +1476,7 @@ public class GeoHazardMonitorTokenController {
                                 }
                             }
                         }
-                    }else {
+                    } else {
                         respHeartbeatVo.setRouteTrack("");
                         respHeartbeatVo.setStationCode("");
                     }
@@ -1476,12 +1495,12 @@ public class GeoHazardMonitorTokenController {
                     jsonObject.put("resultCode", 0);
                     jsonObject.put("message", "该相机暂无视频");
                 }
-                log.info("---------data---结果-------"+respHeartbeatVo);
+                log.info("---------data---结果-------" + respHeartbeatVo);
                 jsonObject.put("data", respHeartbeatVo);
-                log.info("---------jsonObject---开始-------"+jsonObject);
+                log.info("---------jsonObject---开始-------" + jsonObject);
                 long end = System.currentTimeMillis();
                 System.out.println("-------------------" + (begin - end) / 1000);
-                log.info("---------jsonObject---结果-------"+jsonObject);
+                log.info("---------jsonObject---结果-------" + jsonObject);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             } else {
                 jsonObject.put("resultCode", 0);
@@ -2206,7 +2225,7 @@ public class GeoHazardMonitorTokenController {
     public void ttt() {
         List<BaseCameraManagement> list = baseCameraManagementService.list();
         for (BaseCameraManagement baseCameraManagement : list) {
-            log.info("------------baseCameraManagement---------"+baseCameraManagement);
+            log.info("------------baseCameraManagement---------" + baseCameraManagement);
             cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), true);
         }
     }