From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
index 2b24d05..fbc1609 100644
--- a/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
@@ -85,15 +85,23 @@
}
+
/**
- * 获取常见问题列表（不分页查找）
+ * 获取常见问题列表（分页）
+ * @param title
+ * @param content
* @return
*/
- @ApiOperation(value = "获取常见问题列表（不分页查找）",response = AutomessageCommonProblem.class)
- @GetMapping("/queryList")
- public ResultData queryList(@RequestParam(value = "title",required = false) String title){
- return ResultData.success(iAutomessageCommonProblemService.selectConfigList(title,null));
+ @ApiOperation(value = "获取常见问题列表（分页）(不加token)",response = AutomessageCommonProblem.class)
+ @GetMapping("/selectConfigListNoToken")
+ public TableDataInfo selectConfigListNoToken(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "title",required = false) String title,
+ @RequestParam(value = "content",required = false) String content){
+ Page<AutomessageCommonProblem> pageParam = new Page<>(pageNum,pageSize);
+ List<AutomessageCommonProblem> list = iAutomessageCommonProblemService.selectConfigList(pageParam,pageSize,title,content);
+ int num=iAutomessageCommonProblemService.countAutomessageCommonProblem(title,content);
+ return getDataTable(list,num);
}
-
}
--
Gitblit v1.7.1