From c461bd0c3c721b68b954fe23d50c6cbaefdb12fe Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 11 三月 2026 20:38:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java | 2 +-
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java | 2 +-
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java | 2 +-
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java | 2 +-
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java | 7 ++-----
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
index 3307fdb..1a066e6 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -245,7 +245,7 @@
@ApiOperation(value = "运维人员管理导入数据", tags = {"管理后台-运维执行"})
@PostMapping("/api/v1/operationsUser/importOperationsUser")
- public R<String> importOperationsUser(@RequestPart("file") MultipartFile file){
+ public R<String> importOperationsUser(@RequestParam("file") MultipartFile file){
xpOperationsUserService.importOperationsUser(file);
return R.ok();
}
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
index cf8767e..71924e2 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
@@ -208,10 +208,6 @@
public IsInOperationAreaVo isInOperationArea(LonLatCityCodeDto dto) {
IsInOperationAreaVo vo = new IsInOperationAreaVo();
-// Map<String, String> geocode = gdMapGeocodingUtil.geocode(dto.getLongitude().toString(), dto.getLatitude().toString());
-// if(null == geocode){
-// throw new RuntimeException("经纬度转换城市code失败");
-// }
String cityCode = dto.getCityCode();
List<XpGeoFencingPolygon> xpGeoFencingPolygons = mongoTemplate.find(new Query(Criteria.where("cityCode").is(cityCode)), XpGeoFencingPolygon.class);
for (XpGeoFencingPolygon polygon : xpGeoFencingPolygons) {
@@ -233,7 +229,8 @@
if(electronicFence.getFailureType() == 2){
inOperationTime = isInOperationTime(operationStrategy);
}
- if(inOperationTime){
+ XpElectronicFenceArea electronicFenceArea = this.getById(Long.valueOf(polygon.getAreaId()));
+ if(inOperationTime && null != electronicFenceArea && !electronicFenceArea.getDeleted()){
vo.setStatus("inside");
vo.setElectronicAreaId(Long.valueOf(polygon.getAreaId()));
return vo;
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
index d1492e6..9a53ade 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
@@ -148,7 +148,7 @@
}
@ApiOperation(value = "邀请码导入")
@PostMapping("/base/v1/invitation/importExcel")
- public R<String> importExcel(@RequestPart("file") MultipartFile file) {
+ public R<String> importExcel(@RequestParam("file") MultipartFile file) {
ImportParams params = new ImportParams();
params.setHeadRows(1); //表头行数
InputStream inputStream = null;
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 f9ff11f..cc0f9ea 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
@@ -202,7 +202,7 @@
@ApiOperation(value = "白名单导入")
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
@PostMapping("/base/v1/whitelist/importExcel")
- public AjaxResult<String> importExcel(@RequestPart("file") MultipartFile file) {
+ public AjaxResult<String> importExcel(@RequestParam("file") MultipartFile file) {
ImportParams params = new ImportParams();
// params.setTitleRows(1); // 标题行数
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 9a6f7df..5229a8b 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
@@ -276,7 +276,7 @@
*/
@ApiOperation(value = "导入", tags = {"管理后台-车辆管理-在库车辆管理"})
@PostMapping("/api/v1/vehicle/importExcel")
- public R<?> importExcel(@RequestPart("file") MultipartFile file) {
+ public R<?> importExcel(@RequestParam("file") MultipartFile file) {
ImportParams params = new ImportParams();
params.setHeadRows(1);
InputStream inputStream = null;
--
Gitblit v1.7.1