From 77fb7786036fd4c7dd16b9b15c6569cdf2d8ba19 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Nov 2023 16:20:56 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 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 b919465..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,43 +1,63 @@
 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;
+import com.moral.api.service.impl.HistorySecondUavServiceImpl;
+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.*;
 
 
-@Configuration
+/*@Configuration*/
 public class MybatisPlusConfig {
 
-    /**
-    * @Description: ������������������
-            * @Param: []
-            * @return: com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor
-            * @Author: ���������
-            * @Date: 2021/7/15
-            */
+
+
     @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor(){
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+
         //������������
         interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+
+        // ������������SQL���������
         DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor();
-        HashMap<String, TableNameHandler> map = new HashMap<String, TableNameHandler>();
-        map.put("history_five_minutely",(sql,tableName)->{ Date date = new Date();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
-            String month = sdf.format(date);
-            return tableName+"_"+month;});
+        HashMap<String, TableNameHandler> map = new HashMap<>();
+        map.put("history_hourly", (sql, tableName) -> tableName+this.tableName.get());
+        map.put("history_five_minutely", (sql, tableName) -> tableName+this.tableName.get());
 
         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