Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

liujie

2026-06-09 c96fbe6b0aeb413a17c429133ee6d81d138144b9

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleModelController.java

@@ -5,6 +5,9 @@
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;
@@ -33,7 +36,7 @@


    @ApiOperation(value = "车型分页列表", tags = "管理后台-资产-车型管理")
    @PostMapping("/logan/inner/xpVehicleModel/pageList")
    @PostMapping("/api/v1/xpVehicleModel/pageList")
    public R<PageInfo<XpVehicleModel>> pageList(@RequestBody XpVehicleModelPageQuery query) {
        PageInfo<XpVehicleModel> pageInfo = xpVehicleModelService.pageList(query);
        return R.ok(pageInfo);
@@ -51,7 +54,7 @@


    @ApiOperation(value = "车型根据ID查询", tags = "管理后台-资产-车型管理")
    @GetMapping("/logan/inner/xpVehicleModel/getById")
    @GetMapping("/api/v1/xpVehicleModel/getById")
    public R<XpVehicleModel> getById(@RequestParam String id) {
        if (id == null || id.isEmpty()) {
            return R.fail("参数错误");
@@ -65,7 +68,13 @@
    
    
    @ApiOperation(value = "车型新增", tags = "管理后台-资产-车型管理")
    @PostMapping("/logan/inner/xpVehicleModel/add")
    @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());
@@ -80,7 +89,13 @@
    }

    @ApiOperation(value = "车型编辑", tags = "管理后台-资产-车型管理")
    @PostMapping("/logan/inner/xpVehicleModel/edit")
    @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("参数错误");
@@ -103,7 +118,13 @@
    }

    @ApiOperation(value = "车型删除", tags = "管理后台-资产-车型管理")
    @DeleteMapping("/logan/inner/xpVehicleModel/deleteById")
    @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使用。
@@ -129,7 +150,7 @@

    
    @ApiOperation(value = "车型全列表查询", tags = "管理后台-车型全列表查询")
    @PostMapping("/logan/inner/xpVehicleModel/list")
    @PostMapping("/api/v1/xpVehicleModel/list")
    public R<List<XpVehicleModel>> list() {
        List<XpVehicleModel> list = xpVehicleModelService.queryList();
        return R.ok(list);