소스 검색

测试天网视频的分辨率和码率

gao.qiang 1 년 전
부모
커밋
15a5ff9721
1개의 변경된 파일24개의 추가작업 그리고 2개의 파일을 삭제
  1. 24 2
      vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

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

@@ -1043,9 +1043,20 @@ public class GeoHazardMonitorTokenController {
                         camera.last("limit 2");
                         List<BaseCameraManagement> list1 = baseCameraManagementService.list(camera);
                         if (list1.size() <= 0) {
+                            //赋值--股道
+                            List<BaseRouteMassage> baseRouteMassageList = baseRouteMassageService.list();
+                            if (!ObjectUtils.isEmpty(baseRouteMassageList)) {
+                                if (baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() <= 500 && baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
+                                    respHeartbeatVo.setRouteTrack(baseRouteMassageList.get(0).getRouteStationTrack().toString());
+                                }else {
+                                    respHeartbeatVo.setRouteTrack("");
+                                }
+                            }else {
+                                respHeartbeatVo.setRouteTrack("");
+                            }
                             jsonObject.put("resultCode", 0);
                             jsonObject.put("message", "前方没有摄像机");
-                            jsonObject.put("data", "");
+                            jsonObject.put("data", respHeartbeatVo);
                             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
                         }
                         log.info("流程1----------------->");
@@ -1198,9 +1209,20 @@ public class GeoHazardMonitorTokenController {
                     base.last("limit 2");
                     List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
                     if (list1.size() <= 0) {
+                        //赋值--股道
+                        List<BaseRouteMassage> baseRouteMassageList = baseRouteMassageService.list();
+                        if (!ObjectUtils.isEmpty(baseRouteMassageList)) {
+                            if (baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() <= 500 && baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
+                                respHeartbeatVo.setRouteTrack(baseRouteMassageList.get(0).getRouteStationTrack().toString());
+                            }else {
+                                respHeartbeatVo.setRouteTrack("");
+                            }
+                        }else {
+                            respHeartbeatVo.setRouteTrack("");
+                        }
                         jsonObject.put("resultCode", 0);
                         jsonObject.put("message", "没有监控里程的相机");
-                        jsonObject.put("data", "");
+                        jsonObject.put("data", respHeartbeatVo);
                         return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
                     }
                     log.info("流程2----------------->");