From 5a106c938e39d1f82339c122c547434c3d6a5685 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 11 四月 2024 18:22:41 +0800 Subject: [PATCH] 分页插件依赖更换 --- ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java | 6 +++--- ycl-server/src/main/java/com/ycl/platform/controller/CalculateRecordController.java | 6 +++--- ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java | 4 ++-- ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 8 ++++---- ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 4 ++-- ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java | 4 ++-- pom.xml | 13 +++++++++---- ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java | 4 ++-- 8 files changed, 27 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 31104c8..c345219 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <fastjson.version>2.0.43</fastjson.version> <commons.lang.version>2.6</commons.lang.version> <druid.version>1.2.20</druid.version> - <pagehelper.version>1.3.0</pagehelper.version> + <pagehelper.boot.version>1.4.6</pagehelper.boot.version> <aliyun.sdk.oss.version>3.10.2</aliyun.sdk.oss.version> <knife4j.version>3.0.2</knife4j.version> <aspectj.version>1.9.4</aspectj.version> @@ -171,14 +171,19 @@ <version>${druid.version}</version> </dependency> + <!-- pagehelper 鍒嗛〉鎻掍欢 --> <dependency> <groupId>com.github.pagehelper</groupId> <artifactId>pagehelper-spring-boot-starter</artifactId> - <version>${pagehelper.version}</version> + <version>${pagehelper.boot.version}</version> <exclusions> <exclusion> - <artifactId>jsqlparser</artifactId> - <groupId>com.github.jsqlparser</groupId> + <groupId>org.mybatis</groupId> + <artifactId>mybatis</artifactId> + </exclusion> + <exclusion> + <groupId>org.mybatis</groupId> + <artifactId>mybatis-spring</artifactId> </exclusion> </exclusions> </dependency> diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRecordController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRecordController.java index 7c3f9bc..c963552 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRecordController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRecordController.java @@ -31,7 +31,7 @@ /** * 鏌ヨ鏍哥畻璁板綍鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:record:list')") +// @PreAuthorize("@ss.hasPermi('system:record:list')") @GetMapping("/list") public TableDataInfo list(CalculateRecord calculateRecord) { @@ -43,7 +43,7 @@ /** * 瀵煎嚭鏍哥畻璁板綍鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:record:export')") +// @PreAuthorize("@ss.hasPermi('system:record:export')") @Log(title = "鏍哥畻璁板綍", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, CalculateRecord calculateRecord) @@ -56,7 +56,7 @@ /** * 鑾峰彇鏍哥畻璁板綍璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('system:record:query')") +// @PreAuthorize("@ss.hasPermi('system:record:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java index e4636ef..5266676 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java @@ -30,7 +30,7 @@ /** * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('calculate:rule:list')") +// @PreAuthorize("@ss.hasPermi('calculate:rule:list')") @GetMapping("/list") public AjaxResult list(CalculateRule calculateRule) { @@ -54,7 +54,7 @@ /** * 鑾峰彇鏍哥畻瑙勫垯璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('calculate:rule:query')") +// @PreAuthorize("@ss.hasPermi('calculate:rule:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java index 06fbe5c..611828b 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java @@ -32,7 +32,7 @@ /** * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:publish:list')") +// @PreAuthorize("@ss.hasPermi('system:publish:list')") @GetMapping("/list") public TableDataInfo list(CheckPublish checkPublish) { @@ -57,7 +57,7 @@ /** * 鑾峰彇鑰冩牳鍙戝竷璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('system:publish:query')") +// @PreAuthorize("@ss.hasPermi('system:publish:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +67,7 @@ /** * 鏂板鑰冩牳鍙戝竷 */ - @PreAuthorize("@ss.hasPermi('system:publish:add')") +// @PreAuthorize("@ss.hasPermi('system:publish:add')") @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody CheckPublish checkPublish) diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java index 78bbeec..df22a05 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java @@ -31,7 +31,7 @@ /** * 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:result:list')") +// @PreAuthorize("@ss.hasPermi('system:result:list')") @GetMapping("/list") public TableDataInfo list(CheckResult checkResult) { @@ -56,7 +56,7 @@ /** * 鑾峰彇鑰冩牳缁撴灉璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('system:result:query')") +// @PreAuthorize("@ss.hasPermi('system:result:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java index d90e241..81ae394 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java @@ -34,7 +34,7 @@ /** * 鏌ヨ鑰冩牳瑙勫垯鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:rule:list')") +// @PreAuthorize("@ss.hasPermi('system:rule:list')") @PostMapping("/list") public TableDataInfo list(@RequestBody CheckRuleQuery checkRuleQuery) { @@ -59,7 +59,7 @@ /** * 鑾峰彇鑰冩牳瑙勫垯璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('system:rule:query')") +// @PreAuthorize("@ss.hasPermi('system:rule:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java index a9d5283..6d0667a 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java @@ -31,7 +31,7 @@ /** * 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:score:list')") +// @PreAuthorize("@ss.hasPermi('system:score:list')") @GetMapping("/list") public TableDataInfo list(CheckScore checkScore) { @@ -56,7 +56,7 @@ /** * 鑾峰彇鑰冩牳绉垎鏄庣粏璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('system:score:query')") +// @PreAuthorize("@ss.hasPermi('system:score:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java index 5fcdb7e..18f3e66 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java @@ -34,7 +34,7 @@ /** * 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:template:list')") +// @PreAuthorize("@ss.hasPermi('system:template:list')") @GetMapping("/list") public TableDataInfo list(CheckTemplateQuery checkTemplateDTO) { @@ -46,7 +46,7 @@ /** * 瀵煎嚭鑰冩牳妯℃澘鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:template:export')") +// @PreAuthorize("@ss.hasPermi('system:template:export')") @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, CheckTemplateQuery checkTemplateDTO) @@ -59,7 +59,7 @@ /** * 鑾峰彇鑰冩牳妯℃澘璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('system:template:query')") +// @PreAuthorize("@ss.hasPermi('system:template:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -69,7 +69,7 @@ /** * 鏂板鑰冩牳妯℃澘 */ - @PreAuthorize("@ss.hasPermi('system:template:add')") +// @PreAuthorize("@ss.hasPermi('system:template:add')") @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody CheckTemplateQuery checkTemplateDTO) -- Gitblit v1.8.0