车载心跳监测接口添加逻辑

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

@@ -2231,18 +2231,18 @@ public class GeoHazardMonitorTokenController {
             terminal.eq(BaseTerminal::getTerminalCode, baseTerminalLog.getTerminalCode());
             boolean update = baseTerminalService.update(baseTerminal1, terminal);
             if (baseTerminalLogService.save(baseTerminalLog) && update) {
-                if (!ObjectUtils.isEmpty(baseTerminalLog.getTrainNum())&&!ObjectUtils.isEmpty(baseTerminalLog.getFrontTrainNum())){
+                if (!ObjectUtils.isEmpty(baseTerminalLog.getTrainNum()) && !ObjectUtils.isEmpty(baseTerminalLog.getFrontTrainNum())) {
                     VehiclePosition vehiclePosition = vehiclePositionService.getOne(new LambdaQueryWrapper<VehiclePosition>().eq(VehiclePosition::getVehicleCode, baseTerminalLog.getTrainNum()).orderByDesc(VehiclePosition::getCreateTime).last("limit 1"));
                     VehiclePosition positionServiceOne = vehiclePositionService.getOne(new LambdaQueryWrapper<VehiclePosition>().eq(VehiclePosition::getVehicleCode, baseTerminalLog.getFrontTrainNum()).orderByDesc(VehiclePosition::getCreateTime).last("limit 1"));
                     Map<String, Object> map = new HashMap<>();
-                    if (!ObjectUtils.isEmpty(positionServiceOne)) {
+                    if (!ObjectUtils.isEmpty(positionServiceOne) && !ObjectUtils.isEmpty(vehiclePosition)) {
                         int dif = vehiclePosition.getTravelMile() - positionServiceOne.getTravelMile();
                         map.put("frontVehicleDistance", Math.abs(dif));
-                    }else {
+                    } else {
                         map.put("frontVehicleDistance", "_");
                     }
                     AjaxResults1 = new AjaxResults(1, "ok", map);
-                }else {
+                } else {
                     AjaxResults1 = new AjaxResults(1, "ok");
                 }
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -2262,7 +2262,7 @@ public class GeoHazardMonitorTokenController {
     @PostMapping("/api/vehicle/vedio")
     public String vehicleVedio(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
-        log.info("获取机车前向摄像机视频请求地址：{}", request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/api/vehicle/vedio");
+        log.info("获取机车前向摄像机视频请求地址：{}", request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/api/vehicle/vedio");
         log.info("token:{}", token);
         log.info("parameterVo:{}", parameterVo);
         AjaxResults AjaxResults1 = null;
@@ -2283,14 +2283,14 @@ public class GeoHazardMonitorTokenController {
                 AjaxResults1 = new AjaxResults(0, "车号不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
-            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>().eq(BaseCameraManagement::getTrainNum, vehicleVedioResponse.getTrainNum()).eq(BaseCameraManagement::getAbSection,vehicleVedioResponse.getAbSection()));
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>().eq(BaseCameraManagement::getTrainNum, vehicleVedioResponse.getTrainNum()).eq(BaseCameraManagement::getAbSection, vehicleVedioResponse.getAbSection()));
             if (!ObjectUtils.isEmpty(baseCameraManagement)) {
                 CompletableFuture.runAsync(() -> {
                     String playFlv = cameraUtil.heartbeatgetPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), true);
                     log.info("-------playFlv--------" + playFlv);
                     if (StringUtils.isEmpty(playFlv)) {
                         try {
-                            cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(),true, httpUrl);
+                            cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), true, httpUrl);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -2299,7 +2299,7 @@ public class GeoHazardMonitorTokenController {
                 CameraVos cameraVos = new CameraVos();
                 cameraVos.setCameraCode(baseCameraManagement.getCameraCode());
                 cameraVos.setCurrentStream(CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), true, httpUrl));
-                AjaxResults1 = new AjaxResults(1, "ok",cameraVos);
+                AjaxResults1 = new AjaxResults(1, "ok", cameraVos);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             } else {
                 AjaxResults1 = new AjaxResults(0, "未查询到改车号的相机信息");