心跳接口修改

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

@@ -98,6 +98,13 @@ public class BaseTerminal implements Serializable {
     @Excel(name = "关联机车号")
     private String vehicleCode;
 
+    /**
+     * 关联机车号
+     */
+    @TableField(exist = false)
+    @Excel(name = "AB端")
+    private String end;
+
 //    /**
 //     * 是否在线 0.离线 1.在线
 //     */

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

@@ -42,6 +42,20 @@ public class BaseVehicle implements Serializable {
     @Excel(name = "机车号")
     private String vehicleCode;
 
+    /**
+     * 车型
+     */
+    @Excel(name = "车型")
+    private String vehicleType;
+
+
+    /**
+     * AB端
+     */
+    @Excel(name = "AB端")
+    private String end;
+    
+    
     /**
      * 机车名称
      */

business-service/src/main/java/com/ozs/service/impl/BaseTerminalServiceImpl.java

@@ -82,6 +82,7 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
                     BaseVehicle baseVehicle = baseVehicleMapper.selectOne(wrapper2);
                     if (!ObjectUtils.isEmpty(baseVehicle)) {
                         o.setVehicleCode(baseVehicle.getVehicleCode());
+                        o.setEnd(baseVehicle.getEnd());
                     }
                 }
                 return o;