|
@@ -1351,8 +1351,10 @@ public class GeoHazardMonitorTokenController {
|
|
|
List<BaseRouteMassage> list = baseRouteMassageService.list();
|
|
|
if (!ObjectUtils.isEmpty(list)) {
|
|
|
if (list.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() <= 500 && list.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
|
|
|
- respHeartbeatVo.setRouteTrack(list.get(0).getRouteStationTrack());
|
|
|
+ respHeartbeatVo.setRouteTrack(list.get(0).getRouteStationTrack().toString());
|
|
|
}
|
|
|
+ }else {
|
|
|
+ respHeartbeatVo.setRouteTrack("");
|
|
|
}
|
|
|
respHeartbeatVo.setIsAlarm(2);
|
|
|
respHeartbeatVo.setCameraCode(list1.get(0).getCameraCode());
|
|
@@ -2055,7 +2057,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
baseRouteMassage.setCreateTime(new Date());
|
|
|
baseRouteMassage.setStationName("博野站");
|
|
|
- baseRouteMassage.setMileagePosition(11111);
|
|
|
+ baseRouteMassage.setMileagePosition(371685);
|
|
|
baseRouteMassageService.save(baseRouteMassage);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
@@ -2099,6 +2101,10 @@ public class GeoHazardMonitorTokenController {
|
|
|
*/
|
|
|
@PostMapping("/api/ttt")
|
|
|
public void ttt() {
|
|
|
- cameraUtil.heartbeatGetPlayFlv();
|
|
|
+ List<BaseCameraManagement> list = baseCameraManagementService.list();
|
|
|
+ for (BaseCameraManagement baseCameraManagement : list) {
|
|
|
+ log.info("------------baseCameraManagement---------"+baseCameraManagement);
|
|
|
+ cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), true);
|
|
|
+ }
|
|
|
}
|
|
|
}
|