心跳报警信息记录表分页修改

business-service/src/main/java/com/ozs/entity/MsgHeartbeatAlarmMessage.java

@@ -53,7 +53,7 @@ public class MsgHeartbeatAlarmMessage implements Serializable {
      * 机车名称
      */
     @TableField(exist = false)
-    private String vehicleName;
+    private String vehicle;
 
     /**
      * 终端名称

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgHeartbeatAlarmMessageController.java

@@ -61,20 +61,15 @@ public class MsgHeartbeatAlarmMessageController extends BaseController {
             List<MsgHeartbeatAlarmMessage> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseTerminal> wrapper5 = new LambdaQueryWrapper<>();
                 wrapper5.eq(BaseTerminal::getTerminalCode, o.getTerminalCode());
-                BaseTerminal  baseTerminal= baseTerminalService.getOne(wrapper5);
-                if (!ObjectUtils.isEmpty(baseTerminal)){
+                BaseTerminal baseTerminal = baseTerminalService.getOne(wrapper5);
+                if (!ObjectUtils.isEmpty(baseTerminal)) {
                     o.setTerminalName(baseTerminal.getTerminalName());
                 }
                 LambdaQueryWrapper<BaseVehicleTerminal> wrapper1 = new LambdaQueryWrapper<>();
                 wrapper1.eq(BaseVehicleTerminal::getTerminalCode, o.getTerminalCode());
                 BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalService.getOne(wrapper1);
                 if (!ObjectUtils.isEmpty(baseVehicleTerminal)) {
-                    LambdaQueryWrapper<BaseVehicle> wrapper2 = new LambdaQueryWrapper<>();
-                    wrapper2.eq(BaseVehicle::getVehicleCode, baseVehicleTerminal.getVehicleCode());
-                    BaseVehicle baseVehicle = baseVehicleService.getOne(wrapper2);
-                    if (!ObjectUtils.isEmpty(baseVehicle)) {
-                        o.setVehicleName(baseVehicle.getVehicleName());
-                    }
+                    o.setVehicle(baseVehicleTerminal.getVehicleCode());
                 }
                 return o;
             }).collect(Collectors.toList());