|
@@ -62,59 +62,27 @@ public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMappe
|
|
|
|
|
|
@Override
|
|
|
public List<VehiclePosition> vehiclePositionPage(VehiclePositionResp vehiclePositionResp) {
|
|
|
- boolean state = true;
|
|
|
- LambdaQueryWrapper<BaseTerminal> wrapper3=new LambdaQueryWrapper<>();
|
|
|
- if (StringUtils.isNotEmpty(vehiclePositionResp.getTerminalCode())){
|
|
|
- wrapper3.eq(BaseTerminal::getTerminalCode,vehiclePositionResp.getTerminalCode());
|
|
|
- }
|
|
|
- if (StringUtils.isNotEmpty(vehiclePositionResp.getTerminalName())){
|
|
|
- wrapper3.like(BaseTerminal::getTerminalName,vehiclePositionResp.getTerminalName());
|
|
|
- }
|
|
|
- if (!ObjectUtils.isEmpty(vehiclePositionResp.getStatus())){
|
|
|
- wrapper3.eq(BaseTerminal::getStatus,vehiclePositionResp.getStatus());
|
|
|
- }
|
|
|
- List<BaseTerminal> baseTerminals = baseTerminalMapper.selectList(wrapper3);
|
|
|
- QueryWrapper<VehiclePosition> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.orderByDesc("create_time");
|
|
|
- wrapper.last("limit 100");
|
|
|
- List<VehiclePosition> vehiclePositions = baseMapper.selectList(wrapper);
|
|
|
- ArrayList<VehiclePosition> vehiclePositionArrayList = new ArrayList<>();
|
|
|
- for (BaseTerminal baseTerminal : baseTerminals) {
|
|
|
- state = true;
|
|
|
- for (VehiclePosition vehiclePosition : vehiclePositions) {
|
|
|
- if (baseTerminal.getTerminalCode().equals(vehiclePosition.getTerminalCode())) {
|
|
|
- vehiclePosition.setTerminalName(baseTerminal.getTerminalName());
|
|
|
- // 查询线路
|
|
|
- LambdaQueryWrapper<BaseRailwayManagement> lwBaseRailwayManagement = new LambdaQueryWrapper<>();
|
|
|
- if (!StringUtils.isEmptySunhh(vehiclePosition.getRailwayCode())) {
|
|
|
- lwBaseRailwayManagement.eq(BaseRailwayManagement::getRailwayCode, vehiclePosition.getRailwayCode());
|
|
|
- }
|
|
|
- BaseRailwayManagement baseRailwayManagement = baseRailwayManagementMapper.selectOne(lwBaseRailwayManagement);
|
|
|
- if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
|
|
|
- vehiclePosition.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
- }
|
|
|
- if (!ObjectUtils.isEmpty(vehiclePosition.getTravelMile())) {
|
|
|
- vehiclePosition.setTravelMileFormat(AppendUtils.stringAppend(vehiclePosition.getTravelMile()));
|
|
|
- }
|
|
|
- if (!ObjectUtils.isEmpty(vehiclePosition.getLineDir())) {
|
|
|
- vehiclePosition.setLineDirName(vehiclePosition.getLineDir() == 1 ? "上行" : "下行");
|
|
|
- }
|
|
|
- if (!ObjectUtils.isEmpty(baseTerminal.getStatus())) {
|
|
|
- vehiclePosition.setStatus(baseTerminal.getStatus() == 1 ? "在线" : "离线");
|
|
|
- }
|
|
|
- vehiclePositionArrayList.add(vehiclePosition);
|
|
|
- state = false;
|
|
|
- break;
|
|
|
- }
|
|
|
+ List<VehiclePosition> vehiclePositions = baseMapper.vehiclePositionPage(vehiclePositionResp.getTerminalCode(),vehiclePositionResp.getTerminalName(),vehiclePositionResp.getStatus());
|
|
|
+ for (VehiclePosition vehiclePosition : vehiclePositions) {
|
|
|
+ // 查询线路
|
|
|
+ LambdaQueryWrapper<BaseRailwayManagement> lwBaseRailwayManagement = new LambdaQueryWrapper<>();
|
|
|
+ if (!StringUtils.isEmptySunhh(vehiclePosition.getRailwayCode())) {
|
|
|
+ lwBaseRailwayManagement.eq(BaseRailwayManagement::getRailwayCode, vehiclePosition.getRailwayCode());
|
|
|
+ }
|
|
|
+ BaseRailwayManagement baseRailwayManagement = baseRailwayManagementMapper.selectOne(lwBaseRailwayManagement);
|
|
|
+ if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
|
|
|
+ vehiclePosition.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
+ }
|
|
|
+ if (!ObjectUtils.isEmpty(vehiclePosition.getTravelMile())) {
|
|
|
+ vehiclePosition.setTravelMileFormat(AppendUtils.stringAppend(vehiclePosition.getTravelMile()));
|
|
|
+ }
|
|
|
+ if (!ObjectUtils.isEmpty(vehiclePosition.getLineDir())) {
|
|
|
+ vehiclePosition.setLineDirName(vehiclePosition.getLineDir() == 1 ? "上行" : "下行");
|
|
|
}
|
|
|
- if (state) {
|
|
|
- VehiclePosition vehiclePosition = new VehiclePosition();
|
|
|
- vehiclePosition.setStatus(baseTerminal.getStatus() == 1 ? "在线" : "离线");
|
|
|
- vehiclePosition.setTerminalCode(baseTerminal.getTerminalCode());
|
|
|
- vehiclePosition.setTerminalName(baseTerminal.getTerminalName());
|
|
|
- vehiclePositionArrayList.add(vehiclePosition);
|
|
|
+ if (!ObjectUtils.isEmpty(vehiclePosition.getSta())) {
|
|
|
+ vehiclePosition.setStatus(vehiclePosition.getSta() == 1 ? "在线" : "离线");
|
|
|
}
|
|
|
}
|
|
|
- return vehiclePositionArrayList;
|
|
|
+ return vehiclePositions;
|
|
|
}
|
|
|
}
|