机车挂载 返回终端名称

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

@@ -1,6 +1,7 @@
 package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
@@ -24,6 +25,12 @@ public class BaseVehicle implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 挂载终端名称
+     */
+    @TableField(exist = false)
+    private String terminalName;
+
     /**
      * 主键ID
      */

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

@@ -64,6 +64,22 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         int pageSize = Integer.parseInt(baseVehicle.getPageSize().toString());
         com.github.pagehelper.Page<BaseVehicle> page = PageHelper.startPage(pageNum, pageSize)
                 .doSelectPage(() -> baseVehicleMapper.selectList(wrapper));
+        if (!StringUtils.isEmptySunhh(page) && page.getResult().size() > 0) {
+            List<BaseVehicle> dto1 = page.getResult().stream().map(o -> {
+                BaseTerminal baseTerminal = baseTerminalMapper.selectTerminal(o.getVehicleCode());
+                if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+                    LambdaQueryWrapper<BaseVehicleTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
+                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
+                        wrapperBaseVehicleTerminal.eq(BaseVehicleTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                    }
+                    BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
+                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
+                        o.setTerminalName(baseVehicleTerminal.getTerminalName());
+                    }
+                }
+                return o;
+            }).collect(Collectors.toList());
+        }
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseVehicle> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
         pageR.setRecords(page.getResult());