代码修改

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

@@ -75,12 +75,7 @@ public class BaseVehicle implements Serializable {
     @TableField(exist = false)
     @Excel(name = "车载终端")
     private String terminalName;
-
-    /**
-     * 挂载终端名称
-     */
-    @TableField(exist = false)
-    private String terminalCode;
+    
 
     /**
      * 备注

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

@@ -47,6 +47,12 @@ public class VehiclePosition implements Serializable {
     @Excel(name = "终端编码")
     private String terminalCode;
 
+    /**
+     *终端编码
+     */
+    @Excel(name = "终端编码")
+    private String terminalCodes;
+
     /**
      *车辆行驶位置
      */

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

@@ -80,7 +80,6 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                     BaseTerminal baseTerminal1 = baseTerminalMapper.selectOne(wrapperBaseTerminal);
                     if (!StringUtils.isEmptySunhh(baseTerminal1) && !StringUtils.isEmptySunhh(baseTerminal1.getTerminalName())) {
                         o.setTerminalName(baseTerminal1.getTerminalName());
-                        o.setTerminalCode(baseTerminal1.getTerminalCode());
                     }
                 }
                 return o;

business-service/src/main/resources/mapper/VehiclePositionMapper.xml

@@ -43,7 +43,7 @@
         order by a.create_time desc
     </select>
     <select id="vehiclePositionPage" resultType="com.ozs.entity.VehiclePosition">
-        SELECT /*+ GROUP_OPT_FLAG(1)*/ pos.*, ter.terminal_name AS terminalName, ter.status AS sta
+        SELECT /*+ GROUP_OPT_FLAG(1)*/ pos.*, ter.terminal_name AS terminalName, ter.terminal_code AS terminalCodes, ter.status AS sta
         FROM vehicle_position pos
         RIGHT JOIN base_terminal ter ON pos.terminal_code = ter.terminal_code
         AND pos.create_time = (