|  | @@ -1009,14 +1009,14 @@ public class GeoHazardMonitorTokenController {
 | 
	
		
			
				|  |  |                          //            String[] parts = str.split("/");
 | 
	
		
			
				|  |  |                          //            log.info("--------------parts--------------:" + parts);
 | 
	
		
			
				|  |  |                          //            if (parts.length == 2) {
 | 
	
		
			
				|  |  | -//                        CompletableFuture.runAsync(() -> {
 | 
	
		
			
				|  |  | -//                            try {
 | 
	
		
			
				|  |  | -//                                TimeUnit.SECONDS.sleep(3);
 | 
	
		
			
				|  |  | -//                            } catch (InterruptedException e) {
 | 
	
		
			
				|  |  | -//                                e.printStackTrace();
 | 
	
		
			
				|  |  | -//                            }
 | 
	
		
			
				|  |  | -//                            cameraUtil.heartbeatGetPlayFlv();
 | 
	
		
			
				|  |  | -//                        });
 | 
	
		
			
				|  |  | +                        CompletableFuture.runAsync(() -> {
 | 
	
		
			
				|  |  | +                            try {
 | 
	
		
			
				|  |  | +                                TimeUnit.SECONDS.sleep(2);
 | 
	
		
			
				|  |  | +                            } catch (InterruptedException e) {
 | 
	
		
			
				|  |  | +                                e.printStackTrace();
 | 
	
		
			
				|  |  | +                            }
 | 
	
		
			
				|  |  | +                            cameraUtil.heartbeatGetPlayFlv();
 | 
	
		
			
				|  |  | +                        });
 | 
	
		
			
				|  |  |                          //            }
 | 
	
		
			
				|  |  |                          //        }
 | 
	
		
			
				|  |  |                          //    }
 | 
	
	
		
			
				|  | @@ -1044,7 +1044,7 @@ public class GeoHazardMonitorTokenController {
 | 
	
		
			
				|  |  |                          List<BaseCameraManagement> list1 = baseCameraManagementService.list(camera);
 | 
	
		
			
				|  |  |                          if (list1.size() <= 0) {
 | 
	
		
			
				|  |  |                              jsonObject.put("resultCode", 0);
 | 
	
		
			
				|  |  | -                            jsonObject.put("message", "没有监控里程的相机");
 | 
	
		
			
				|  |  | +                            jsonObject.put("message", "前方没有摄像机");
 | 
	
		
			
				|  |  |                              jsonObject.put("data", "");
 | 
	
		
			
				|  |  |                              return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
 | 
	
		
			
				|  |  |                          }
 | 
	
	
		
			
				|  | @@ -1099,14 +1099,14 @@ 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();
 | 
	
		
			
				|  |  | +                            });
 | 
	
		
			
				|  |  |                          } else {
 | 
	
		
			
				|  |  |                              log.info("-------------->>已进入拉一路视频");
 | 
	
		
			
				|  |  |                              log.info("list1-------------->>" + list1.size());
 | 
	
	
		
			
				|  | @@ -1158,14 +1158,14 @@ 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();
 | 
	
		
			
				|  |  | +                            });
 | 
	
		
			
				|  |  |                          }
 | 
	
		
			
				|  |  |                          twoMap.put("currentStream", playFlv);
 | 
	
		
			
				|  |  |                          twoMap.put("cameraCode", list1.get(0).getCameraCode());
 | 
	
	
		
			
				|  | @@ -1261,14 +1261,14 @@ 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();
 | 
	
		
			
				|  |  | +                        });
 | 
	
		
			
				|  |  |  //                        List<String> finalCodeList2 = codeList;
 | 
	
		
			
				|  |  |  //                        CompletableFuture.runAsync(() -> {
 | 
	
		
			
				|  |  |  //                            log.info("-------------->>finalCodeList2-------" + finalCodeList2);
 | 
	
	
		
			
				|  | @@ -1335,14 +1335,14 @@ public class GeoHazardMonitorTokenController {
 | 
	
		
			
				|  |  |  //                                }
 | 
	
		
			
				|  |  |  //                            }
 | 
	
		
			
				|  |  |  //                        }
 | 
	
		
			
				|  |  | -//                        CompletableFuture.runAsync(() -> {
 | 
	
		
			
				|  |  | -//                            try {
 | 
	
		
			
				|  |  | -//                                TimeUnit.SECONDS.sleep(3);
 | 
	
		
			
				|  |  | -//                            } catch (InterruptedException e) {
 | 
	
		
			
				|  |  | -//                                e.printStackTrace();
 | 
	
		
			
				|  |  | -//                            }
 | 
	
		
			
				|  |  | -//                            cameraUtil.heartbeatGetPlayFlv();
 | 
	
		
			
				|  |  | -//                        });
 | 
	
		
			
				|  |  | +                        CompletableFuture.runAsync(() -> {
 | 
	
		
			
				|  |  | +                            try {
 | 
	
		
			
				|  |  | +                                TimeUnit.SECONDS.sleep(2);
 | 
	
		
			
				|  |  | +                            } catch (InterruptedException e) {
 | 
	
		
			
				|  |  | +                                e.printStackTrace();
 | 
	
		
			
				|  |  | +                            }
 | 
	
		
			
				|  |  | +                            cameraUtil.heartbeatGetPlayFlv();
 | 
	
		
			
				|  |  | +                        });
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  |                      twoMap.put("currentStream", playFlv);
 | 
	
		
			
				|  |  |                      twoMap.put("cameraCode", list1.get(0).getCameraCode());
 |