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

puzhibing

2026-05-12 08cc6d5cf7e93b75cfabe7dcc2aeaa9afa1117eb

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeManagementController.java

@@ -5,6 +5,9 @@
import com.xiaopeng.api.model.operation.XpFeedbackType;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.log.annotation.AdminOperationLog;
import com.xiaopeng.common.log.enums.AdminBusinessType;
import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.operation.constant.I18nKeyConstant;
import com.xiaopeng.operation.service.IXpFeedbackTypeService;
import io.swagger.annotations.Api;
@@ -48,16 +51,34 @@
    }
    @ApiOperation(value = "新增意见反馈类型")
    @PostMapping(value = "/saveFeedbackType")
    @AdminOperationLog(
            businessType = AdminBusinessType.FEEDBACK_TYPE_MANAGEMENT,
            operationType = AdminOperationType.ADD,
            content = "新增意见反馈类型",
            appendRequestData = true
    )
    public R<Boolean> add(@RequestBody XpFeedbackType xpFeedbackType) {
        return R.ok(xpFeedbackTypeService.save(xpFeedbackType));
    }
    @ApiOperation(value = "编辑意见反馈类型")
    @PostMapping(value = "/updateFeedbackType")
    @AdminOperationLog(
            businessType = AdminBusinessType.FEEDBACK_TYPE_MANAGEMENT,
            operationType = AdminOperationType.EDIT,
            content = "编辑意见反馈类型",
            appendRequestData = true
    )
    public R<Boolean> updateFeedbackType(@RequestBody XpFeedbackType xpFeedbackType) {
        return R.ok(xpFeedbackTypeService.updateById(xpFeedbackType));
    }
    @ApiOperation(value = "删除意见反馈类型")
    @DeleteMapping(value = "/deleteFeedbackType")
    @AdminOperationLog(
            businessType = AdminBusinessType.FEEDBACK_TYPE_MANAGEMENT,
            operationType = AdminOperationType.DELETE,
            contentExpression = "'删除意见反馈类型,id=' + #p0",
            appendRequestData = false
    )
    public R<Boolean> deleteFeedbackType(Long id) {
        // 判断工单是否包含这个类型
        R<Boolean> include = xpWorkOrderClient.include(id);