|
@@ -62,14 +62,14 @@ public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMappe
|
|
|
|
|
|
@Override
|
|
|
public List<VehiclePosition> vehiclePositionPage(VehiclePositionResp vehiclePositionResp) {
|
|
|
- boolean state=true;
|
|
|
+ boolean state = true;
|
|
|
List<BaseTerminal> baseTerminals = baseTerminalMapper.selectList(null);
|
|
|
QueryWrapper<VehiclePosition> wrapper = new QueryWrapper<>();
|
|
|
wrapper.orderByDesc("create_time");
|
|
|
List<VehiclePosition> vehiclePositions = baseMapper.selectList(wrapper);
|
|
|
ArrayList<VehiclePosition> vehiclePositionArrayList = new ArrayList<>();
|
|
|
for (BaseTerminal baseTerminal : baseTerminals) {
|
|
|
- state=true;
|
|
|
+ state = true;
|
|
|
for (VehiclePosition vehiclePosition : vehiclePositions) {
|
|
|
if (baseTerminal.getTerminalCode().equals(vehiclePosition.getTerminalCode())) {
|
|
|
vehiclePosition.setTerminalName(baseTerminal.getTerminalName());
|
|
@@ -89,13 +89,18 @@ public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMappe
|
|
|
if (!ObjectUtils.isEmpty(baseTerminal.getStatus())) {
|
|
|
vehiclePosition.setStatus(baseTerminal.getStatus() == 1 ? "在线" : "离线");
|
|
|
}
|
|
|
+ String builder = vehiclePosition.getRailwayName() +
|
|
|
+ "-" +
|
|
|
+ vehiclePosition.getLineDirName() + "-" +
|
|
|
+ "里程位置" + vehiclePosition.getTravelMileFormat();
|
|
|
+ vehiclePosition.setMileagePosition(builder);
|
|
|
vehiclePositionArrayList.add(vehiclePosition);
|
|
|
- state=false;
|
|
|
+ state = false;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- if (state){
|
|
|
- VehiclePosition vehiclePosition =new VehiclePosition();
|
|
|
+ if (state) {
|
|
|
+ VehiclePosition vehiclePosition = new VehiclePosition();
|
|
|
vehiclePosition.setStatus(baseTerminal.getStatus() == 1 ? "在线" : "离线");
|
|
|
vehiclePosition.setTerminalCode(baseTerminal.getTerminalCode());
|
|
|
vehiclePositionArrayList.add(vehiclePosition);
|