diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index 79890d8..f59eec2 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -30,7 +30,7 @@ for (int i = 0; i < data.getRouteData().getLines().size(); i++) { BusRoutePath line = data.getRouteData().getLines().get(i); // 是否在路线上 - Point p = new Point(data.getPosData().getCarPositionDto().getLng(), data.getPosData().getCarPositionDto().getLng()); + Point p = new Point(data.getPosData().getCarPositionDto().getLng(), data.getPosData().getCarPositionDto().getLat()); Point start = new Point(line.getStartLng(), line.getStartLat()); Point terminal = new Point(line.getEndLng(), line.getEndLat()); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index 79890d8..f59eec2 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -30,7 +30,7 @@ for (int i = 0; i < data.getRouteData().getLines().size(); i++) { BusRoutePath line = data.getRouteData().getLines().get(i); // 是否在路线上 - Point p = new Point(data.getPosData().getCarPositionDto().getLng(), data.getPosData().getCarPositionDto().getLng()); + Point p = new Point(data.getPosData().getCarPositionDto().getLng(), data.getPosData().getCarPositionDto().getLat()); Point start = new Point(line.getStartLng(), line.getStartLat()); Point terminal = new Point(line.getEndLng(), line.getEndLat()); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java index 4865b23..22a5bb7 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java @@ -75,7 +75,7 @@ lineIds.add(line.getId()); } } - if (!CollectionUtils.isEmpty(lineIds)) { + if (CollectionUtils.isEmpty(lineIds)) { //未在规定时间 指定线段行驶报警 res.setStatus(StrategyAlarmConst.DIST_LJSDBJ_CODE); res.setPos(posAlarm); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index 79890d8..f59eec2 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -30,7 +30,7 @@ for (int i = 0; i < data.getRouteData().getLines().size(); i++) { BusRoutePath line = data.getRouteData().getLines().get(i); // 是否在路线上 - Point p = new Point(data.getPosData().getCarPositionDto().getLng(), data.getPosData().getCarPositionDto().getLng()); + Point p = new Point(data.getPosData().getCarPositionDto().getLng(), data.getPosData().getCarPositionDto().getLat()); Point start = new Point(line.getStartLng(), line.getStartLat()); Point terminal = new Point(line.getEndLng(), line.getEndLat()); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java index 4865b23..22a5bb7 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/TrajectoryTimeAlarmStrategy.java @@ -75,7 +75,7 @@ lineIds.add(line.getId()); } } - if (!CollectionUtils.isEmpty(lineIds)) { + if (CollectionUtils.isEmpty(lineIds)) { //未在规定时间 指定线段行驶报警 res.setStatus(StrategyAlarmConst.DIST_LJSDBJ_CODE); res.setPos(posAlarm); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java index 3b593fc..6c6a999 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java @@ -104,9 +104,11 @@ //获取当前时段信息 Map map = getStartAndEndTime(times); Long carId = busCarInfo.getId(); - if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(105))){ - carId = 5L; - } +// if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(106))){ +// carId = 5L; +// map.put("start","2021-05-26 10:15:00"); +// map.put("end","2021-05-26 12:00:00"); +// } //获取规定时间内 车辆定位数据 List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);