心跳接口修改

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

@@ -66,6 +66,7 @@ import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.utils.CameraUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -812,9 +813,9 @@ public class GeoHazardMonitorTokenController {
                                     }
                                 }
                             }
-                            //添加心跳相机日志信息
-                            int add2 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
-                            log.info("-----add2----" + add2);
+//                            //添加心跳相机日志信息
+//                            int add2 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+//                            log.info("-----add2----" + add2);
                         }
                     } else {
                         //没有报警信息的时候
@@ -876,9 +877,14 @@ public class GeoHazardMonitorTokenController {
                                     }
                                 }
                             }
+                            ArrayList<String> list3 = new ArrayList<>();
                             //添加缓存
-                            log.info("--------------heartbeat--------------:" + list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
-                            redisCache.setCacheObject("heartbeat", list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
+                            for (BaseCameraManagement baseCameraManagement : list1) {
+                                String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
+                                list3.add(code);
+                            }
+                            log.info("--------------heartbeat--------------:"+list3);
+                            redisCache.setCacheObject("heartbeat", list3);
                         } else {
                             log.info("-------------->>已进入拉一路视频");
                             log.info("list1-------------->>" + list1.size());
@@ -907,9 +913,14 @@ public class GeoHazardMonitorTokenController {
                                     }
                                 }
                             }
+                            ArrayList<String> list3 = new ArrayList<>();
                             //添加缓存
-                            log.info("--------------heartbeat--------------:" + list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
-                            redisCache.setCacheObject("heartbeat", list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
+                            for (BaseCameraManagement baseCameraManagement : list1) {
+                                String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
+                                list3.add(code);
+                            }
+                            log.info("--------------heartbeat--------------:"+list3);
+                            redisCache.setCacheObject("heartbeat", list3);
                         }
                         twoMap.put("currentStream", playFlv);
                         twoMap.put("cameraCode", list1.get(0).getCameraCode());
@@ -980,9 +991,14 @@ public class GeoHazardMonitorTokenController {
                                 }
                             }
                         }
+                        ArrayList<String> list3 = new ArrayList<>();
                         //添加缓存
-                        log.info("--------------heartbeat--------------:" + list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
-                        redisCache.setCacheObject("heartbeat", list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
+                        for (BaseCameraManagement baseCameraManagement : list1) {
+                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
+                            list3.add(code);
+                        }
+                        log.info("--------------heartbeat--------------:"+list3);
+                        redisCache.setCacheObject("heartbeat", list3);
 //                        List<String> finalCodeList2 = codeList;
 //                        CompletableFuture.runAsync(() -> {
 //                            log.info("-------------->>finalCodeList2-------" + finalCodeList2);
@@ -1026,9 +1042,14 @@ public class GeoHazardMonitorTokenController {
                                 }
                             }
                         }
+                        ArrayList<String> list3 = new ArrayList<>();
                         //添加缓存
-                        log.info("--------------heartbeat--------------:" + list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
-                        redisCache.setCacheObject("heartbeat", list1.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList()));
+                        for (BaseCameraManagement baseCameraManagement : list1) {
+                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
+                            list3.add(code);
+                        }
+                        log.info("--------------heartbeat--------------:"+list3);
+                        redisCache.setCacheObject("heartbeat", list3);
                     }
                     twoMap.put("currentStream", playFlv);
                     twoMap.put("cameraCode", list1.get(0).getCameraCode());