车载终端台账增加挂载机车名称

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

@@ -94,6 +94,12 @@ public class BaseTerminal implements Serializable {
     @Excel(name = "备注")
     private String remark;
 
+    /**
+     * 机车名称
+     */
+    @TableField(exist = false)
+    private String vehicleName;
+
 //    /**
 //     * 是否在线 0.离线 1.在线
 //     */

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

@@ -1,25 +1,34 @@
 package com.ozs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanValidators;
+import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.BaseVehicle;
+import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.mapper.BaseTerminalMapper;
+import com.ozs.mapper.BaseVehicleMapper;
+import com.ozs.mapper.BaseVehicleTerminalMapper;
 import com.ozs.service.BaseTerminalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import javax.validation.Validator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -36,6 +45,10 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
     private BaseTerminalMapper baseTerminalMapper;
     @Autowired
     protected Validator validator;
+    @Autowired
+    private BaseVehicleTerminalMapper baseVehicleTerminalMapper;
+    @Autowired
+    private BaseVehicleMapper baseVehicleMapper;
 
     @Override
     public IPage<BaseTerminal> vehicleTerminalList(BaseVehicleTerminalVo baseVehicleTerminalleVo) {
@@ -58,6 +71,23 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
         pageR.setRecords(page.getResult());
         pageR.setTotal(page.getTotal());
+        if (!ObjectUtils.isEmpty(pageR) && !ObjectUtils.isEmpty(pageR.getRecords())) {
+            List<BaseTerminal> dto1 = pageR.getRecords().stream().map(o -> {
+                LambdaQueryWrapper<BaseVehicleTerminal> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(BaseVehicleTerminal::getTerminalCode, o.getTerminalCode());
+                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapper1);
+                if (!ObjectUtils.isEmpty(baseVehicleTerminal)) {
+                    LambdaQueryWrapper<BaseVehicle> wrapper2 = new LambdaQueryWrapper<>();
+                    wrapper2.eq(BaseVehicle::getVehicleCode, baseVehicleTerminal.getVehicleCode());
+                    BaseVehicle baseVehicle = baseVehicleMapper.selectOne(wrapper2);
+                    if (!ObjectUtils.isEmpty(baseVehicle)) {
+                        o.setVehicleName(baseVehicle.getVehicleName());
+                    }
+                }
+                return o;
+            }).collect(Collectors.toList());
+            pageR.setRecords(dto1);
+        }
         return pageR;
     }