From aa343eafae29f8171d22496ce876ead1d0f07bd0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 14:36:42 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 b2fdc75..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
@@ -28,15 +28,6 @@
private IAutomessageCommonProblemService iAutomessageCommonProblemService;
- /**
- * 获取常见问题列表(不分页)
- * @return
- */
- @ApiOperation(value = "获取常见问题列表(不分页)",response = AutomessageCommonProblem.class)
- @GetMapping("/selectList")
- public ResultData selectList(){
- return ResultData.success(iAutomessageCommonProblemService.selectList());
- }
/**
* 获取常见问题列表（分页）
@@ -92,4 +83,25 @@
ResultData delete( @RequestParam(value = "id") Integer id){
return iAutomessageCommonProblemService.delete(id);
}
+
+
+
+ /**
+ * 获取常见问题列表（分页）
+ * @param title
+ * @param content
+ * @return
+ */
+ @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