From f33eaf279fdae3a5cae7775dc2a67e2d080dd5e0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 五月 2026 00:03:14 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpWhitelistService.java | 3 ++-
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java | 6 +-----
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java | 8 ++++++++
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 3 ++-
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java | 6 ++++--
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java | 14 ++++++++++++++
6 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
index 85206d8..4dadd5b 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
@@ -149,11 +149,7 @@
return R.fail("有效期不能早于当前日期");
}
- XpWhitelist xpWhitelist = new XpWhitelist();
- BeanUtils.copyProperties(dto, xpWhitelist);
- xpWhitelist.setUpdateBy(tokenService.getLoginUser().getSysUser().getNickName());
-
- return xpWhitelistService.editWhitelist(xpWhitelist, sysUser);
+ return xpWhitelistService.editWhitelist(dto, sysUser);
}
/**
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpWhitelistService.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpWhitelistService.java
index a5062b8..9e09653 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpWhitelistService.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpWhitelistService.java
@@ -7,6 +7,7 @@
import com.xiaopeng.common.core.web.domain.AjaxResult;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.dto.WhitelistAddDto;
+import com.xiaopeng.operation.dto.WhitelistEditDto;
import com.xiaopeng.operation.query.WhitelistPageListQuery;
import java.util.List;
@@ -27,7 +28,7 @@
R addWhitelist(WhitelistAddDto dto, SysUser sysUser);
- R editWhitelist(XpWhitelist dto, SysUser sysUser);
+ R editWhitelist(WhitelistEditDto dto, SysUser sysUser);
R freezeUnfreeze(Long id, SysUser sysUser);
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
index 9b102c8..3bc1899 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
@@ -18,6 +18,7 @@
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.constant.I18nKeyConstant;
import com.xiaopeng.operation.dto.WhitelistAddDto;
+import com.xiaopeng.operation.dto.WhitelistEditDto;
import com.xiaopeng.operation.mapper.XpWhitelistMapper;
import com.xiaopeng.operation.mapper.XpWhitelistOperlogMapper;
import com.xiaopeng.operation.query.WhitelistPageListQuery;
@@ -274,7 +275,7 @@
}
@Override
- public R editWhitelist(XpWhitelist dto, SysUser sysUser) {
+ public R editWhitelist(WhitelistEditDto dto, SysUser sysUser) {
if (!PhoneUtil.isMobile(dto.getAccount())) {
throw new ServiceException("以下帐号格式不正确：", I18nKeyConstant.ACCOUNT_FORMAT_ERROR, new Object[]{dto.getAccount()});
}
@@ -288,7 +289,7 @@
}
XpWhitelist whitelist = this.getById(dto.getId());
whitelist.setAccount(SensitiveDataCryptoUtil.decryptIfPossible(whitelist.getAccount()));
-
+ whitelist.setNickName(userByAccount.getNickName());
whitelist.setAppUserId(userByAccount.getUid());
StringBuilder operationContent = new StringBuilder("编辑账号:");
@@ -332,6 +333,7 @@
StringBuilder content = operationContent.append(accountBuilder);
xpWhitelistOperlog.setOperationContent(content.toString());
xpWhitelistOperlogMapper.insert(xpWhitelistOperlog);
+
whitelist.setNickName(dto.getNickName());
whitelist.setIsPriorityDispatch(dto.getIsPriorityDispatch());
whitelist.setAccount(SensitiveDataCryptoUtil.encrypt(dto.getAccount()));
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 31638f7..a041974 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -3491,6 +3491,7 @@
// return R.ok(resultMap);
// }
// }
+// return R.fail();
@@ -3514,7 +3515,7 @@
}
baseMapper.updateById(order);
bootCommonService.setCache_orderStatus(order.getId(), order, null);
- return R.fail();
+ return R.ok();
}
/**
diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
index e21bdbc..85d95f2 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -20,6 +20,7 @@
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.XpOperationsUser;import com.xiaopeng.api.model.maintenance.XpTask;
import com.xiaopeng.api.model.maintenance.XpTaskRule;
+import com.xiaopeng.api.model.maintenance.XpVehicleModel;
import com.xiaopeng.api.model.operation.XpOfficialPartner;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
import com.xiaopeng.api.model.vehicleConvoy.XpFleetVehicle;
@@ -121,6 +122,9 @@
private final XpVehicleRepairClient xpVehicleRepairClient;
private final AliOssService aliOssService;
private final AliOssDownloadUtil aliOssDownloadUtil;
+
+ @Resource
+ private XpVehicleModelClient xpVehicleModelClient;
/**
* 根据ID列表批量查询车辆信息（内部接口）
@@ -976,6 +980,10 @@
public R<XpVehicleVO> vehicleDetail(@RequestParam Long id) {
// 查询车辆
XpVehicle xpVehicle = xpVehicleService.getById(id);
+ List<XpVehicleModel> vehicleModels = xpVehicleModelClient.listByIds(Arrays.asList(xpVehicle.getVehicleModel())).getData();
+ if(null != vehicleModels && vehicleModels.size() > 0){
+ xpVehicle.setVehicleModelName(vehicleModels.get(0).getName());
+ }
XpVehicleVO xpVehicleVO = new XpVehicleVO();
BeanUtils.copyProperties(xpVehicle, xpVehicleVO);
// 查询运维规则 保养周期
diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
index 4a8e27c..833d99f 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
@@ -21,6 +21,7 @@
import com.xiaopeng.api.dto.vehicleConvoy.VehicleTemperatureDto;
import com.xiaopeng.api.feignClient.account.UserResourcesClient;
import com.xiaopeng.api.feignClient.automaticPilot.XpuVinClient;
+import com.xiaopeng.api.feignClient.maintenance.XpVehicleModelClient;
import com.xiaopeng.api.feignClient.map.AdcFencePushClient;
import com.xiaopeng.api.feignClient.map.XpMapClient;
import com.xiaopeng.api.feignClient.operation.XpElectronicClient;
@@ -30,6 +31,7 @@
import com.xiaopeng.api.feignClient.pushMessage.XpPushMessageClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.UserVehicleClient;
import com.xiaopeng.api.model.account.XpOperationsUser;
+import com.xiaopeng.api.model.maintenance.XpVehicleModel;
import com.xiaopeng.api.model.operation.XpElectronicFence;
import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
import com.xiaopeng.api.model.operation.XpOfficialPartner;
@@ -163,6 +165,9 @@
@Resource
private OfficialPartnerUtil officialPartnerUtil;
+
+ @Resource
+ private XpVehicleModelClient xpVehicleModelClient;
@Value("${vehicle.control.distance-threshold:100}")
private int distanceThreshold;
@@ -1179,6 +1184,15 @@
wrapper.orderByDesc(XpVehicle::getCreateTime);
//3.执行分页查询
PageInfo<XpVehicle> page = this.page(pageInfo, wrapper);
+ List<String> collect = page.getRecords().stream().map(XpVehicle::getVehicleModel).collect(Collectors.toList());
+ List<XpVehicleModel> vehicleModels = xpVehicleModelClient.listByIds(collect).getData();
+ for (XpVehicle record : page.getRecords()) {
+ XpVehicleModel xpVehicleModel = vehicleModels.stream().filter(item -> item.getId().toString().equals(record.getVehicleModel())).findFirst().orElse(null);
+ if(null != xpVehicleModel){
+ record.setVehicleModelName(xpVehicleModel.getName());
+ }
+ }
+
decryptVehicles(page.getRecords());
//4.批量查询围栏名称并填充
--
Gitblit v1.7.1