yangdamao 8 месяцев назад
Родитель
Сommit
af277b3b51

+ 6 - 1
pom.xml

@@ -16,7 +16,6 @@
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.4</druid.version>
         <knife4j.version>2.0.8</knife4j.version>
-        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
         <fastjson.version>1.2.75</fastjson.version>
         <oshi.version>5.6.0</oshi.version>
         <jna.version>5.7.0</jna.version>
@@ -129,6 +128,12 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>${mybatis-plus.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.pagehelper</groupId>
+                    <artifactId>pagehelper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

+ 0 - 2
src/main/java/com/zhongzheng/ZhongZhengOfficialApplication.java

@@ -14,6 +14,4 @@ public class ZhongZhengOfficialApplication {
         System.out.println("(♥◠‿◠)ノ゙  中正官网启动成功   ლ(´ڡ`ლ)゙");
     }
 
-
-
 }

+ 1 - 1
src/main/java/com/zhongzheng/api/OfficialApiController.java

@@ -104,7 +104,7 @@ public class OfficialApiController extends BaseController {
      */
     @ApiOperation("新增留言")
     @PostMapping("/suggest")
-    public AjaxResult saveSuggest(OfficialSuggestBo bo) {
+    public AjaxResult saveSuggest(@RequestBody OfficialSuggestBo bo) {
         return toAjax(officialApiService.saveSuggest(bo) ? 1 : 0);
     }
 

+ 23 - 0
src/main/java/com/zhongzheng/config/MybatisPlusConfig.java

@@ -0,0 +1,23 @@
+package com.zhongzheng.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@MapperScan("com.zhongzheng.mapper") // 替换为你的Mapper接口所在包
+public class MybatisPlusConfig {
+
+	@Bean
+	public MybatisPlusInterceptor mybatisPlusInterceptor() {
+		MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+		// 添加分页插件
+		interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+		return interceptor;
+	}
+
+}

+ 1 - 1
src/main/java/com/zhongzheng/service/impl/OfficialActivityServiceImpl.java

@@ -42,7 +42,7 @@ public class OfficialActivityServiceImpl extends ServiceImpl<OfficialActivityMap
 
     @Override
     public Page<OfficialActivityVo> listOfficialActivity(OfficialArticleQuery query) {
-        Page<OfficialActivity> page = page(new Page<>(query.getPageSize(), query.getPageNum()));
+        Page<OfficialActivity> page = page(new Page<>(query.getPageNum(), query.getPageSize()));
         if (CollectionUtils.isEmpty(page.getRecords())){
             return new Page<>();
         }

+ 4 - 3
src/main/java/com/zhongzheng/service/impl/OfficialApiServiceImpl.java

@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhongzheng.bo.*;
 import com.zhongzheng.entity.*;
 import com.zhongzheng.exception.CustomException;
+import com.zhongzheng.mapper.OfficialArticleMapper;
 import com.zhongzheng.service.*;
 import com.zhongzheng.util.DateUtils;
 import com.zhongzheng.util.HttpUtils;
@@ -21,9 +21,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -67,6 +67,7 @@ public class OfficialApiServiceImpl implements IOfficialApiService {
 
 
     @Override
+    @Transactional // 必须添加此注解
     public List<OfficialMenuVo> listOfficialMenu(OfficialMenuQuery query) {
         //获取一级菜单
         List<OfficialMenu> list = officialMenuService.list(new LambdaQueryWrapper<OfficialMenu>()
@@ -92,7 +93,7 @@ public class OfficialApiServiceImpl implements IOfficialApiService {
             //获取所有子集id
             getChildrenIds(query.getParentId(),menuIds);
         }
-        Page<OfficialArticle> list = officialArticleService.page(new Page<>(query.getPageSize(),query.getPageNum()),
+        Page<OfficialArticle> list = officialArticleService.page(new Page<>(query.getPageNum(),query.getPageSize()),
                 new LambdaQueryWrapper<OfficialArticle>()
                 .eq(ObjectUtils.isNotNull(query.getMenuId()),OfficialArticle::getMenuId, query.getMenuId())
                 .in(CollectionUtils.isNotEmpty(menuIds),OfficialArticle::getMenuId,menuIds)

+ 1 - 1
src/main/java/com/zhongzheng/service/impl/OfficialArticleServiceImpl.java

@@ -48,7 +48,7 @@ public class OfficialArticleServiceImpl extends ServiceImpl<OfficialArticleMappe
 
     @Override
     public Page<OfficialArticleVo> listOfficialArticle(OfficialArticleQuery query) {
-        Page<OfficialArticle> page = page(new Page<>(query.getPageSize(), query.getPageSize()), new LambdaQueryWrapper<OfficialArticle>()
+        Page<OfficialArticle> page = page(new Page<>(query.getPageNum(), query.getPageSize()), new LambdaQueryWrapper<OfficialArticle>()
                 .eq(ObjectUtils.isNotNull(query.getMenuId()), OfficialArticle::getMenuId, query.getMenuId())
                 .eq(ObjectUtils.isNotNull(query.getTopStatus()), OfficialArticle::getTopStatus, query.getTopStatus())
                 .eq(ObjectUtils.isNotNull(query.getStatus()), OfficialArticle::getStatus, query.getStatus())

+ 1 - 1
src/main/java/com/zhongzheng/service/impl/OfficialLinkServiceImpl.java

@@ -40,7 +40,7 @@ public class OfficialLinkServiceImpl extends ServiceImpl<OfficialLinkMapper, Off
 
     @Override
     public Page<OfficialLinkVo> listOfficialLink(OfficialLinkQuery query) {
-        Page<OfficialLink> page = page(new Page<>(query.getPageSize(), query.getPageNum()),
+        Page<OfficialLink> page = page(new Page<>(query.getPageNum(), query.getPageSize()),
                 new LambdaQueryWrapper<OfficialLink>().like(StringUtils.isNotBlank(query.getKeyword()),OfficialLink::getTitle, query.getKeyword()));
         if (CollectionUtils.isEmpty(page.getRecords())){
             return new Page<>();

+ 1 - 1
src/main/java/com/zhongzheng/service/impl/OfficialProblemServiceImpl.java

@@ -40,7 +40,7 @@ public class OfficialProblemServiceImpl extends ServiceImpl<OfficialProblemMappe
 
     @Override
     public Page<OfficialProblemVo> listOfficialProblem(OfficialProblemQuery query) {
-        Page<OfficialProblem> page = page(new Page<>(query.getPageSize(), query.getPageNum()),
+        Page<OfficialProblem> page = page(new Page<>(query.getPageNum(), query.getPageSize()),
                 new LambdaQueryWrapper<OfficialProblem>().like(StringUtils.isNotBlank(query.getKeyword()),OfficialProblem::getTitle, query.getKeyword()));
         if (CollectionUtils.isEmpty(page.getRecords())){
             return new Page<>();

+ 1 - 1
src/main/java/com/zhongzheng/service/impl/OfficialSuggestServiceImpl.java

@@ -37,7 +37,7 @@ public class OfficialSuggestServiceImpl extends ServiceImpl<OfficialSuggestMappe
 
     @Override
     public Page<OfficialSuggestVo> listOfficialSuggest(OfficialSuggestQuery query) {
-        Page<OfficialSuggest> page = page(new Page<>(query.getPageSize(), query.getPageNum()),
+        Page<OfficialSuggest> page = page(new Page<>(query.getPageNum(), query.getPageSize()),
                 new LambdaQueryWrapper<OfficialSuggest>().like(StringUtils.isNotBlank(query.getKeyword()),OfficialSuggest::getContent, query.getKeyword()));
         if (CollectionUtils.isEmpty(page.getRecords())){
             return new Page<>();

+ 1 - 8
src/main/resources/application.yml

@@ -139,8 +139,6 @@ mybatis-plus:
   # REUSE:该执行器类型会复用预处理语句(PreparedStatement)
   # BATCH:该执行器类型会批量执行所有的更新语句
   executorType: SIMPLE
-  # 指定外部化 MyBatis Properties 配置,通过该配置可以抽离配置,实现不同环境的配置部署
-  configurationProperties: null
   typeHandlersPackage: com.zhongzheng.common.type
   configuration:
     # 自动驼峰命名规则(camel case)映射
@@ -169,6 +167,7 @@ mybatis-plus:
     localCacheScope: SESSION
     # 开启Mybatis二级缓存,默认为 true
     cacheEnabled: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     # 是否打印 Logo banner
     banner: true
@@ -210,12 +209,6 @@ mybatis-plus:
   # 开启多租户
   tenant:
     enabled-tenant: true
-# PageHelper分页插件
-pagehelper:
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql
 
 # Swagger配置
 swagger: