From 724e7026b9dca44f7083b751fb3dbba7d9ff8770 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 26 二月 2026 17:07:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeController.java |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeController.java
index 57652ab..f023fb4 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeController.java
@@ -3,17 +3,18 @@
 
 import com.xiaopeng.api.model.operation.XpFeedbackType;
 import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.web.page.BasePage;
+import com.xiaopeng.common.core.web.page.PageInfo;
 import com.xiaopeng.operation.service.IXpFeedbackTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -27,8 +28,6 @@
 
 @Slf4j
 @RestController
-@RequestMapping("/base/v1/mini-program")
-@Api(tags = "意见反馈类型")
 public class XpFeedbackTypeController {
 
 
@@ -37,20 +36,41 @@
     public XpFeedbackTypeController(IXpFeedbackTypeService xpFeedbackTypeService) {
         this.xpFeedbackTypeService = xpFeedbackTypeService;
     }
+
     /**
      * 获取反馈类型
+     *
      * @return
      */
-    @GetMapping("/getFeedbackTypeById/{id}")
-    public R<XpFeedbackType> getFeedbackTypeById(@PathVariable("id")Long id){
+    @GetMapping("/base/v1/mini-program/getFeedbackTypeById/{id}")
+    public R<XpFeedbackType> getFeedbackTypeById(@PathVariable("id") Long id) {
         return R.ok(xpFeedbackTypeService.getById(id));
     }
 
-    @GetMapping("/feedback-type/getList")
-    @ApiOperation(value = "获取意见反馈类型列表",tags = {"意见反馈类型列表"},response = XpFeedbackType.class)
+    @GetMapping("/base/v1/mini-program/feedback-type/getList")
+    @ApiOperation(value = "获取意见反馈类型列表", tags = {"意见反馈类型列表"}, response = XpFeedbackType.class)
     public R<List<XpFeedbackType>> getList() {
         List<XpFeedbackType> list = xpFeedbackTypeService.list();
         return R.ok(list);
     }
 
+    @ApiOperation(value = "获取意见反馈类型分页列表", tags = {"管理后台-服务中心"}, response = XpFeedbackType.class)
+    @PostMapping("/api/v1/feedbackType/pageList")
+    public R<PageInfo<XpFeedbackType>> getPageList(@RequestBody BasePage basePage) {
+        return R.ok(xpFeedbackTypeService.getPageList(basePage));
+    }
+
+    @ApiOperation(value = "新增、编辑意见反馈类型", tags = {"管理后台-服务中心"})
+    @PostMapping("/api/v1/feedbackType/saveOrUpdate")
+    public R<?> saveOrUpdate(@RequestBody @Valid XpFeedbackType xpFeedbackType) {
+        xpFeedbackTypeService.saveOrUpdate(xpFeedbackType);
+        return R.ok();
+    }
+
+    @ApiOperation(value = "删除意见反馈类型", tags = {"管理后台-服务中心"})
+    @DeleteMapping("/api/v1/feedbackType/delete/{id}")
+    public R<?> delete(@PathVariable Long id) {
+        xpFeedbackTypeService.removeById(id);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1