新增线上配置

zhangback

2026-03-30 f0570bd1986323562fa041e4e1e03607e7899ea3

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java

@@ -8,6 +8,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.*;
@@ -122,6 +123,34 @@
        );
    }

    @Override
    public Map<String, Object> tmsTripListPage(Integer dispatchId, Integer pageNum, Integer pageSize) {
        Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
        if (deviceId == null) {
            Map<String, Object> empty = new HashMap<>();
            empty.put("rows", Collections.emptyList());
            empty.put("total", 0);
            return empty;
        }

        LambdaQueryWrapper<TmsTrip> wrapper = new LambdaQueryWrapper<TmsTrip>()
                .eq(TmsTrip::getDriverId, deviceId);
        // dispatchId 可选，不传时查该司机全部行程
        if (dispatchId != null) {
            wrapper.eq(TmsTrip::getDispatchOrderId, dispatchId);
        }
        // 按行程时间倒序
        wrapper.orderByDesc(TmsTrip::getTripTime);

        Page<TmsTrip> page = new Page<>(pageNum, pageSize);
        Page<TmsTrip> result = tmsTripMapper.selectPage(page, wrapper);

        Map<String, Object> map = new HashMap<>();
        map.put("rows", result.getRecords());
        map.put("total", result.getTotal());
        return map;
    }

    /**
     * 查询行程列表 异步 导出
     *
@@ -204,10 +233,10 @@
            asyncPdfService.generateTripPdfAsync(tmsTrip,tmsDispatchOrder,tmsDriver);
        }
        // 完成身体检查
        if (tmsTrip.getTripType() == 1){
        if (tmsTrip.getTripType() == 1 && tmsDispatchOrder.getOperationMode() == 0){
            // 添加 领钥匙 指令记录
            TmsVehicle tmsVehicle = tmsVehicleServiceImpl.selectTmsVehicleById(tmsDispatchOrder.getVehicleId());

            logger.info("添加 领钥匙 指令记录,{},{}",tmsDispatchOrder.getVehicleId(),tmsVehicle.getCarKeyNo());
            TmsCarKeyDispatch tmsCarKeyDispatch = new TmsCarKeyDispatch();
            tmsCarKeyDispatch.setDispatchOrderId(dispatchOrderId);
            tmsCarKeyDispatch.setDispatchOrderNo(tmsDispatchOrder.getDispatchNo());