From cce00ec65fed11f204fa0cbceee52a3e4653d68a Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 13 二月 2026 16:47:51 +0800
Subject: [PATCH] fix:联调修改
---
xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java b/xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
index 84bb913..d91decc 100644
--- a/xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
+++ b/xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.collection.CollUtil;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.dto.vehicleConvoy.VehicleTemperatureDto;
import com.xiaopeng.api.feignClient.operation.XpElectronicClient;
@@ -19,7 +20,6 @@
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.web.page.PageInfo;
-import com.xiaopeng.common.security.utils.SecurityUtils;
import com.xiaopeng.vehicleConvoy.constant.I18nKeyConstant;
import com.xiaopeng.vehicleConvoy.mapper.XpVehicleMapper;
import com.xiaopeng.vehicleConvoy.model.dto.*;
@@ -191,7 +191,6 @@
xpVehicle.setStatus(1);
// 设置入库时间
xpVehicle.setWarehousingTime(LocalDateTime.now());
- xpVehicle.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
this.save(xpVehicle);
}
@@ -201,8 +200,6 @@
// DTO转实体
XpVehicle xpVehicle = new XpVehicle();
BeanUtil.copyProperties(dto, xpVehicle);
-
- xpVehicle.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
this.updateById(xpVehicle);
}
@@ -242,7 +239,6 @@
//保存年检记录
XpVehicleAnnualRecord xpVehicleAnnualRecord = BeanUtil.copyProperties(dto, XpVehicleAnnualRecord.class, "id");
xpVehicleAnnualRecord.setVehicleId(dto.getId());
- xpVehicleAnnualRecord.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getCreateBy());
xpVehicleAnnualRecordService.save(xpVehicleAnnualRecord);
}
@@ -610,7 +606,12 @@
}
@Override
- public List<XpVehicleVO> getList(String plateNumber, String fleetName) {
- return baseMapper.getList(plateNumber, fleetName);
+ public PageInfo<XpVehicleVO> getVehiclePageList(VehicleSelectPageQuery query) {
+ Page<XpVehicleVO> page = new Page<>(query.getPageNum(), query.getPageSize());
+ page = baseMapper.getVehiclePageList(page, query.getPlateNumber(), query.getFleetName());
+ PageInfo<XpVehicleVO> pageInfo = new PageInfo<>();
+ pageInfo.setTotal(page.getTotal());
+ pageInfo.setRecords(page.getRecords());
+ return pageInfo;
}
}
--
Gitblit v1.7.1