From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 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 8b810d5..e57509c 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,13 +1,20 @@
package com.moral.api.config.mybatis;
-import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.annotation.DbType;
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.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.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -18,36 +25,25 @@
@Configuration
public class MybatisPlusConfig {
- /**
- * ������������
- */
- @Bean
- public PaginationInterceptor paginationInterceptor() {
- PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
- return paginationInterceptor;
- }
+ public static ThreadLocal<String> tableName = new ThreadLocal<>();
- /**
- * @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);
+
return interceptor;
}
-
}
--
Gitblit v1.8.0