From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleModelController.java | 82 +++++++++++++++++++++++++++++++---------
1 files changed, 63 insertions(+), 19 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleModelController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleModelController.java
index d8e65b2..ff075d9 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleModelController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleModelController.java
@@ -1,12 +1,18 @@
package com.xiaopeng.maintenance.controller;
+import cn.hutool.core.collection.CollUtil;
import com.xiaopeng.api.feignClient.operation.XpPricingClient;
import com.xiaopeng.api.model.maintenance.XpVehicleModel;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.maintenance.model.query.XpVehicleModelPageQuery;
import com.xiaopeng.maintenance.service.IXpVehicleModelService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +20,7 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.List;
@Slf4j
@@ -28,14 +35,26 @@
private XpPricingClient xpPricingClient;
- @ApiOperation(value = "分页列表", tags = "管理后台-分页列表")
- @PostMapping("/logan/inner/xpVehicleModel/pageList")
+ @ApiOperation(value = "车型分页列表", tags = "管理后台-资产-车型管理")
+ @PostMapping("/api/v1/xpVehicleModel/pageList")
public R<PageInfo<XpVehicleModel>> pageList(@RequestBody XpVehicleModelPageQuery query) {
PageInfo<XpVehicleModel> pageInfo = xpVehicleModelService.pageList(query);
return R.ok(pageInfo);
}
- @ApiOperation(value = "根据ID查询", tags = "管理后台-车型根据ID查询")
- @GetMapping("/logan/inner/xpVehicleModel/getById")
+
+
+ @PostMapping("/logan/inner/xpVehicleModel/listByIds")
+ @ApiOperation(value = "车型根据ID列表批量查询", tags = {"内部接口"})
+ public R<List<XpVehicleModel>> listByIds(@RequestBody List<String> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return R.ok(new ArrayList<>());
+ }
+ return R.ok(xpVehicleModelService.listByIds(ids));
+ }
+
+
+ @ApiOperation(value = "车型根据ID查询", tags = "管理后台-资产-车型管理")
+ @GetMapping("/api/v1/xpVehicleModel/getById")
public R<XpVehicleModel> getById(@RequestParam String id) {
if (id == null || id.isEmpty()) {
return R.fail("参数错误");
@@ -48,12 +67,18 @@
}
- @ApiOperation(value = "新增", tags = "管理后台-车型新增")
- @PostMapping("/logan/inner/xpVehicleModel/add")
+ @ApiOperation(value = "车型新增", tags = "管理后台-资产-车型管理")
+ @PostMapping("/api/v1/xpVehicleModel/add")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.VEHICLE_MODEL_MANAGEMENT,
+ operationType = AdminOperationType.ADD,
+ content = "车型新增",
+ appendRequestData = true
+ )
public R<String> add(@RequestBody @Valid XpVehicleModel dto) {
// 根据名称查询车辆型号，验证是否已存在
List<XpVehicleModel> existingModel = xpVehicleModelService.queryByName(dto.getName());
- if (existingModel != null) {
+ if (CollUtil.isNotEmpty(existingModel)) {
return R.fail("车辆型号名称已存在");
}
boolean b = xpVehicleModelService.save(dto);
@@ -63,8 +88,14 @@
return R.fail("保存失败");
}
- @ApiOperation(value = "编辑", tags = "管理后台-车型编辑")
- @PostMapping("/logan/inner/xpVehicleModel/edit")
+ @ApiOperation(value = "车型编辑", tags = "管理后台-资产-车型管理")
+ @PostMapping("/api/v1/xpVehicleModel/edit")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.VEHICLE_MODEL_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "车型编辑",
+ appendRequestData = true
+ )
public R<String> edit(@RequestBody @Valid XpVehicleModel dto) {
if(dto.getId() == null){
return R.fail("参数错误");
@@ -75,7 +106,7 @@
}
if(!model.getName().equals(dto.getName())){
List<XpVehicleModel> existingModel = xpVehicleModelService.queryByName(dto.getName());
- if (existingModel != null) {
+ if (CollUtil.isNotEmpty(existingModel)) {
return R.fail("车辆型号名称已存在");
}
}
@@ -86,9 +117,15 @@
return R.fail("保存失败");
}
- @ApiOperation(value = "删除", tags = "管理后台-车型删除")
- @DeleteMapping("/logan/inner/xpVehicleModel/deleteById")
- public R<String> deleteById(@RequestParam String id) {
+ @ApiOperation(value = "车型删除", tags = "管理后台-资产-车型管理")
+ @DeleteMapping("/api/v1/xpVehicleModel/deleteById")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.VEHICLE_MODEL_MANAGEMENT,
+ operationType = AdminOperationType.DELETE,
+ contentExpression = "'车型删除,id=' + #p0",
+ appendRequestData = false
+ )
+ public R<String> deleteById(@RequestParam Long id) {
/*
1.判断车型是否被 车辆 xp_vehicle使用。
2.判断车型是否被 定价管理 xp_pricing使用。
@@ -97,14 +134,14 @@
if (vehicleCount > 0) {
return R.fail("车辆型号已被车辆使用");
}
- R<Long> priceCountByVmidR = xpPricingClient.getPriceCountByVmid(id);
+ R<Long> priceCountByVmidR = xpPricingClient.getPriceCountByVmid(id+"");
if (priceCountByVmidR.getCode() != R.SUCCESS || priceCountByVmidR.getData() == null) {
return R.fail("根据车型获取定价策略失败");
}
if(priceCountByVmidR.getData()>0){
return R.fail("车辆型号已被定价策略使用");
}
- boolean b = xpVehicleModelService.logicalRemoveById(id);
+ boolean b = xpVehicleModelService.removeById(id);
if(b){
return R.ok();
}
@@ -112,8 +149,8 @@
}
- @ApiOperation(value = "全列表查询", tags = "管理后台-车型全列表查询")
- @PostMapping("/logan/inner/xpVehicleModel/list")
+ @ApiOperation(value = "车型全列表查询", tags = "管理后台-车型全列表查询")
+ @PostMapping("/api/v1/xpVehicleModel/list")
public R<List<XpVehicleModel>> list() {
List<XpVehicleModel> list = xpVehicleModelService.queryList();
return R.ok(list);
@@ -124,8 +161,15 @@
-
-
+ @GetMapping("/drainage/v1/vehicleModel/list")
+ @ApiOperation(value = "查询可使用的车型列表", notes = "流量接入-基础信息")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "token", name = "token", required = true, paramType = "header")
+ })
+ public R<List<XpVehicleModel>> getVehicleModelList() {
+ List<XpVehicleModel> list = xpVehicleModelService.queryList();
+ return R.ok(list);
+ }
--
Gitblit v1.7.1