|
@@ -228,6 +228,17 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
|
|
|
List<BaseTerminal> baseVehicleTerminalList = baseTerminalMapper.selectList(wrapper);
|
|
|
for (BaseTerminal baseVehicleTerminal1 : baseVehicleTerminalList) {
|
|
|
baseVehicleTerminal1.setStatusStr(baseVehicleTerminal1.getStatus() == 1 ? "在线" : "离线");
|
|
|
+ LambdaQueryWrapper<BaseVehicleTerminal> wrapper1 = new LambdaQueryWrapper<>();
|
|
|
+ wrapper1.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal1.getTerminalCode());
|
|
|
+ BaseVehicleTerminal baseVehicleTerminals = baseVehicleTerminalMapper.selectOne(wrapper1);
|
|
|
+ if (!ObjectUtils.isEmpty(baseVehicleTerminals)) {
|
|
|
+ LambdaQueryWrapper<BaseVehicle> wrapper2 = new LambdaQueryWrapper<>();
|
|
|
+ wrapper2.eq(BaseVehicle::getVehicleCode, baseVehicleTerminal.getVehicleCode());
|
|
|
+ BaseVehicle baseVehicle = baseVehicleMapper.selectOne(wrapper2);
|
|
|
+ if (!ObjectUtils.isEmpty(baseVehicle)) {
|
|
|
+ baseVehicleTerminal1.setVehicleCode(baseVehicle.getVehicleCode());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return baseVehicleTerminalList;
|
|
|
}
|