From 90e290a34ee09eac129b4ba648975be8f9fd8fa0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 11 Oct 2021 15:07:58 +0800
Subject: [PATCH] screen-aqi 删除多余的分表拦截器
---
/dev/null | 103 ----------------------------------
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 5 +
screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java | 14 ----
3 files changed, 4 insertions(+), 118 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 a43b5e9..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
@@ -32,7 +32,7 @@
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
//������������
- interceptor.addInnerInterceptor(new PaginationInnerInterceptorIIL(DbType.MYSQL));
+ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
// ������������SQL���������
DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor();
@@ -45,17 +45,5 @@
return interceptor;
}
-
- /*@Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-
- //������������
- PaginationInnerInterceptorIIL paginationInnerInterceptorIIL = new PaginationInnerInterceptorIIL(DbType.MYSQL);
- paginationInnerInterceptorIIL.setMultiTableQueryName(multiTableQueryNames);
- interceptor.addInnerInterceptor(paginationInnerInterceptorIIL);
-
- return interceptor;
- }*/
}
diff --git a/screen-api/src/main/java/com/moral/api/config/mybatis/PaginationInnerInterceptorIIL.java b/screen-api/src/main/java/com/moral/api/config/mybatis/PaginationInnerInterceptorIIL.java
deleted file mode 100644
index 4c69042..0000000
--- a/screen-api/src/main/java/com/moral/api/config/mybatis/PaginationInnerInterceptorIIL.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.moral.api.config.mybatis;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ParameterUtils;
-import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
-import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;
-import lombok.SneakyThrows;
-import net.sf.jsqlparser.JSQLParserException;
-import net.sf.jsqlparser.parser.CCJSqlParserUtil;
-import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.*;
-import org.apache.ibatis.executor.Executor;
-import org.apache.ibatis.mapping.BoundSql;
-import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.mapping.ParameterMapping;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.session.RowBounds;
-
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName
- * @Description TODO
- * @Author ���������
- * @Date 2021/9/18 10:13
- * @Version TODO
- **/
-public class PaginationInnerInterceptorIIL extends PaginationInnerInterceptor {
-
- private List<String> multiTableQueryName;
-
- public void setMultiTableQueryName(List<String> multiTableQueryName) {
- this.multiTableQueryName = multiTableQueryName;
- }
-
- public PaginationInnerInterceptorIIL(DbType dbType) {
- super(dbType);
- }
-
- @SneakyThrows
- @Override
- public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
- IPage<?> page = ParameterUtils.findPage(parameter).orElse(null);
- if (null == page) {
- return;
- }
-
- // ������ orderBy ������
- boolean addOrdered = false;
- String buildSql = boundSql.getSql();
- List<OrderItem> orders = page.orders();
- if (!CollectionUtils.isEmpty(orders)) {
- addOrdered = true;
- buildSql = this.concatOrderBy(buildSql, orders);
- }
-
-
- // size ������ 0 ���������������sql
- if (page.getSize() < 0) {
- if (addOrdered) {
- PluginUtils.mpBoundSql(boundSql).sql(buildSql);
- }
- return;
- }
-
- handlerLimit(page);
- IDialect dialect = findIDialect(executor);
-
- //������������������������������������
- String tableName = getTableName(buildSql);
- if(multiTableQueryName.contains(tableName)){
- System.out.println(111);
- }
-
- final Configuration configuration = ms.getConfiguration();
- DialectModel model = dialect.buildPaginationSql(buildSql, page.offset(), page.getSize());
- PluginUtils.MPBoundSql mpBoundSql = PluginUtils.mpBoundSql(boundSql);
-
- List<ParameterMapping> mappings = mpBoundSql.parameterMappings();
- Map<String, Object> additionalParameter = mpBoundSql.additionalParameters();
- model.consumers(mappings, configuration, additionalParameter);
- mpBoundSql.sql(model.getDialectSql());
- mpBoundSql.parameterMappings(mappings);
- }
-
- private String getTableName(String buildSql) throws JSQLParserException {
- Select select = (Select) CCJSqlParserUtil.parse(buildSql);
- PlainSelect selectBody = (PlainSelect) select.getSelectBody();
- Table table = (Table) selectBody.getFromItem();
- return table.getName();
- }
-
-
-
-}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
index f35ec68..67408e5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
@@ -173,7 +173,7 @@
dto.setSensorCode(sensor);
timeValueMap.forEach((time, valueJson) -> {
Map<String, Object> listMap = new HashMap<>();
- //������������������������������
+ //���������������������������������������������
if (valueJson == null) {
listMap.put("time", time);
listMap.put("value", "");
@@ -182,7 +182,7 @@
}
Map<String, Object> valueMap = JSON.parseObject(valueJson, Map.class);
Object sensorValueObject = valueMap.get(sensor);
- //������������������������������������������null
+ //���������������������������������������������
if (sensorValueObject == null) {
listMap.put("time", time);
listMap.put("value", "");
@@ -191,6 +191,7 @@
}
//������������������������������������������
if (reportType.equals(Constants.DAILY_REPORT)) {
+ //���������������������N���������������
if (!Constants.NORMAL_FLAG.equals(valueMap.get(sensor + "-Flag"))) {
listMap.put("time", time);
listMap.put("value", "");
--
Gitblit v1.8.0