From 631b4dae9b1d44c37def19a4bb0682ee3fa29bbc Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 2 Nov 2023 11:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=9D=A1=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kqapi/common/handler/MyBatisPlusConfig.java    | 29 ++++++++++++++++++++++
 .../controller/PolicyRegulationsController.java    |  2 +-
 .../kqapi/zzsfw/manage/PolicyManage.java           | 10 ++++----
 3 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/common/handler/MyBatisPlusConfig.java

diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/MyBatisPlusConfig.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/MyBatisPlusConfig.java
new file mode 100644
index 0000000..cf850e0
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/MyBatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.ningdatech.kqapi.common.handler;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MyBatisPlusConfig {
+
+    /**
+     * 插件配置
+     *
+     * @return
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+
+        // 向MyBatis-Plus的过滤器链中添加分页拦截器，需要设置数据库类型（主要用于分页方言）
+//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        // 添加乐观锁拦截器
+        interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+        return interceptor;
+    }
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java
index bd7e509..7511a09 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java
@@ -30,7 +30,7 @@ public class PolicyRegulationsController {
 
     @ApiOperation(value = "政策条例分页列表", notes = "政策条例分页列表")
     @GetMapping("/list")
-    public PageVo<NdKqZzsfwPolicyVO> list(@RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "10") int pageSize) {
+    public PageVo<NdKqZzsfwPolicyVO> list(@RequestParam(defaultValue = "1") long pageNumber, @RequestParam(defaultValue = "10") long pageSize) {
         return policyManage.list(pageNumber,pageSize);
     }
 }
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java
index 00312e9..3aa804b 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java
@@ -29,17 +29,17 @@ public class PolicyManage {
     private final INdKqZzsfwPolicyService policyService;
 
 
-    public PageVo<NdKqZzsfwPolicyVO> list(int pageNumber, int pageSize) {
+    public PageVo<NdKqZzsfwPolicyVO> list(long pageNumber, long pageSize) {
         Page<NdKqZzsfwPolicy> page = Page.of(pageNumber,pageSize);
-        policyService.page(page,Wrappers.lambdaQuery(NdKqZzsfwPolicy.class)
+        Page<NdKqZzsfwPolicy> pageRes = policyService.page(page, Wrappers.lambdaQuery(NdKqZzsfwPolicy.class)
                 .orderByAsc(NdKqZzsfwPolicy::getSort));
 
-        if(CollUtil.isEmpty(page.getRecords())){
+        if(CollUtil.isEmpty(pageRes.getRecords())){
             return PageVo.empty();
         }
-        List<NdKqZzsfwPolicyVO> res = page.getRecords().stream()
+        List<NdKqZzsfwPolicyVO> res = pageRes.getRecords().stream()
                 .map(p -> BeanUtil.copyProperties(p,NdKqZzsfwPolicyVO.class))
                 .collect(Collectors.toList());
-        return PageVo.of(res,page.getTotal());
+        return PageVo.of(res,pageRes.getTotal());
     }
 }