From a0fe2290b235be4460d2118bac76ef3d64980d47 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 11:54:59 +0800
Subject: [PATCH] ci:补充提交

---
 screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java b/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java
index 804a61f..9b40ff2 100644
--- a/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java
+++ b/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java
@@ -1,12 +1,16 @@
 package com.moral.api.config.mybatis;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.extension.parsers.DynamicTableNameParser;
 import com.baomidou.mybatisplus.extension.parsers.ITableNameHandler;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TableNameHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.moral.api.entity.HistoryFiveMinutely;
 import com.moral.api.mapper.HistoryFiveMinutelyMapper;
 import com.moral.api.service.HistorySecondUavService;
@@ -14,10 +18,13 @@
 import com.moral.api.service.impl.OrganizationServiceImpl;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
+import javax.sql.DataSource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -25,7 +32,7 @@
 /*@Configuration*/
 public class MybatisPlusConfig {
 
-    public static ThreadLocal<String> tableName = new ThreadLocal<>();
+
 
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
@@ -42,8 +49,15 @@
 
         dynamicTableNameInnerInterceptor.setTableNameHandlerMap(map);
         interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor);
-
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
         return interceptor;
     }
+    @Bean
+    public ConfigurationCustomizer configurationCustomizer() {
+        return configuration -> configuration.setUseDeprecatedExecutor(false);
+    }
+
+
+    public static ThreadLocal<String> tableName = new ThreadLocal<>();
 
 }

--
Gitblit v1.8.0