修改加密密钥

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

@@ -608,6 +608,7 @@ public class GeoHazardMonitorTokenController {
                 queryWrapper.ge(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
                 queryWrapper.le(MsgAlarm::getAlarmMile, (heartbeatVo.getCurrentMile() + 10000));
                 queryWrapper.eq(MsgAlarm::getLineDir, heartbeatVo.getLineDir());
+                queryWrapper.eq(MsgAlarm::getRailwayCode,heartbeatVo.getRailwayCode());
                 queryWrapper.orderByAsc(MsgAlarm::getAlarmMile);
                 List<MsgAlarm> list = msgAlarmService.list(queryWrapper);
                 //有报警信息的时候
@@ -718,9 +719,16 @@ public class GeoHazardMonitorTokenController {
                         base.lt(BaseCameraManagement::getInstallMile, distance);
                     }
                     base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
+                    base.eq(BaseCameraManagement::getRailwayCode,heartbeatVo.getRailwayCode());
                     base.orderByAsc(BaseCameraManagement::getInstallMile);
                     base.last("limit 4");
                     List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
+                    if (list1.size()<=0){
+                        jsonObject.put("resultCode", 0);
+                        jsonObject.put("message", "失败");
+                        jsonObject.put("data", "没有监控里程的相机");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
+                    }
                     CameraUtil.invite(list1.get(0).getCameraCode(), list1.get(0).getChannel());
                     String flv = CameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getChannel(), false);
                     twoMap.put("currentStream", flv);