代码修改

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

@@ -668,10 +668,10 @@ public class GeoHazardMonitorTokenController {
                         ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                         ment.orderByAsc(BaseCameraManagement::getInstallMile);
                         if (i == 0) {
-                            wrapper.last("limit 1,1000000");
+                            ment.last("limit 1,1000000");
                         }
                         //获取所有报警安装里程位置的相机
-                        List<BaseCameraManagement> baseList = baseCameraManagementService.list(camera);
+                        List<BaseCameraManagement> baseList = baseCameraManagementService.list(ment);
                         if (baseList.size() > 0) {
                             for (int o = 0; o < baseList.size(); o++) {
                                 String flv = CameraUtil.getPlayFlvRtsp(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), false);
@@ -702,11 +702,6 @@ public class GeoHazardMonitorTokenController {
                                 alarmListVo.setAlarmInfo(alarmInfoVo1);
                                 listVos.add(alarmListVo);
                             }
-                        } else {
-                            jsonObject.put("resultCode", 0);
-                            jsonObject.put("message", "失败");
-                            jsonObject.put("data", "报警里程无可用相机");
-                            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
                         }
                     }
                     AlarmListVo[] array = listVos.toArray(new AlarmListVo[]{});