refactor: 规范代码结构

backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java → backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java

-package io.dataease.datasource.constants;
+package io.dataease.commons.constants;
 
 public enum DatasourceTypes {
     excel("excel", "excel", "", "", "", "", ""),

backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java

 package io.dataease.commons.utils;
 
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import org.apache.poi.hssf.eventusermodel.*;

backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java

 package io.dataease.commons.utils;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import org.apache.commons.collections4.CollectionUtils;

backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java

@@ -6,7 +6,7 @@ import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableIncrementalConfig;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.response.DataSetDetail;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.dataset.ExcelFileData;
 import io.dataease.service.dataset.DataSetTableService;

backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java → backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java

-package io.dataease.datasource.controller;
+package io.dataease.controller.datasource;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -10,8 +10,8 @@ import io.dataease.commons.utils.Pager;
 import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.datasource.dto.DBTableDTO;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.dto.datasource.DBTableDTO;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.DatasourceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java

 package io.dataease.controller.request.dataset;
 
 import io.dataease.base.domain.DatasetTable;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

backend/src/main/java/io/dataease/datasource/request/DatasourceRequest.java → backend/src/main/java/io/dataease/controller/request/datasource/DatasourceRequest.java

-package io.dataease.datasource.request;
+package io.dataease.controller.request.datasource;
 
 import io.dataease.base.domain.Datasource;
 import lombok.Getter;

backend/src/main/java/io/dataease/datasource/dto/es/EsReponse.java → backend/src/main/java/io/dataease/controller/request/datasource/es/EsReponse.java

-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/datasource/dto/es/Requst.java → backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java

-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/datasource/dto/es/RequstWithCursor.java → backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java

-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java

 package io.dataease.dto.dataset;
 
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

backend/src/main/java/io/dataease/datasource/dto/CHConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/CHConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/datasource/dto/DBTableDTO.java → backend/src/main/java/io/dataease/dto/datasource/DBTableDTO.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

backend/src/main/java/io/dataease/datasource/dto/DorisConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/DorisConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/datasource/dto/EsConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/EsConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 
 import lombok.Getter;

backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/JdbcConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 
 import lombok.Getter;

backend/src/main/java/io/dataease/datasource/dto/MongodbConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/MongodbConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/MysqlConfigration.java

+package io.dataease.dto.datasource;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MysqlConfigration extends JdbcConfiguration {
+
+    private String driver = "com.mysql.cj.jdbc.Driver";
+
+    public String getJdbc() {
+        // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
+        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000&useSSL=false"
+                .replace("HOSTNAME", getHost().trim())
+                .replace("PORT", getPort().toString().trim())
+                .replace("DATABASE", getDataBase().trim());
+    }
+}
\ No newline at end of file

backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/datasource/dto/OracleConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/OracleConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/datasource/dto/PgConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/datasource/dto/RedshiftConfigration.java → backend/src/main/java/io/dataease/dto/datasource/RedshiftConfigration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/datasource/dto/SqlServerConfiguration.java → backend/src/main/java/io/dataease/dto/datasource/SqlServerConfiguration.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/datasource/dto/TableFiled.java → backend/src/main/java/io/dataease/dto/datasource/TableFiled.java

-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

backend/src/main/java/io/dataease/dto/panel/PanelViewTableDTO.java

@@ -2,10 +2,6 @@ package io.dataease.dto.panel;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
-import io.dataease.base.domain.PanelGroupWithBLOBs;
-import io.dataease.commons.model.ITreeBase;
-import io.dataease.datasource.dto.TableFiled;
-import io.dataease.dto.chart.ChartViewDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

backend/src/main/java/io/dataease/job/sechedule/Schedular.java

 package io.dataease.job.sechedule;
 
 import com.fit2cloud.quartz.anno.QuartzScheduled;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.service.dataset.DataSetTableService;
 import org.springframework.stereotype.Component;
 

backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java

 package io.dataease.listener;
 
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.service.dataset.DataSetTableService;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;

backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java → backend/src/main/java/io/dataease/provider/ProviderFactory.java

-package io.dataease.datasource.provider;
+package io.dataease.provider;
 
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.provider.DDLProvider;
-import io.dataease.provider.QueryProvider;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.query.DDLProvider;
+import io.dataease.provider.query.QueryProvider;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

backend/src/main/java/io/dataease/datasource/provider/DatasourceProvider.java → backend/src/main/java/io/dataease/provider/datasource/DatasourceProvider.java

-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
-import io.dataease.datasource.dto.TableFiled;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.dto.datasource.TableFiled;
+import io.dataease.controller.request.datasource.DatasourceRequest;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

backend/src/main/java/io/dataease/datasource/provider/EsProvider.java → backend/src/main/java/io/dataease/provider/datasource/EsProvider.java

-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import io.dataease.commons.utils.HttpClientConfig;
 import io.dataease.commons.utils.HttpClientUtil;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.dto.es.EsReponse;
-import io.dataease.datasource.dto.es.Requst;
-import io.dataease.datasource.dto.es.RequstWithCursor;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.controller.request.datasource.es.EsReponse;
+import io.dataease.controller.request.datasource.es.Requst;
+import io.dataease.controller.request.datasource.es.RequstWithCursor;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.dto.datasource.EsConfiguration;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
-import io.dataease.provider.es.EsQueryProvider;
+import io.dataease.provider.query.es.EsQueryProvider;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpHeaders;

backend/src/main/java/io/dataease/datasource/provider/ExtendedJdbcClassLoader.java → backend/src/main/java/io/dataease/provider/datasource/ExtendedJdbcClassLoader.java

-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
 
 import java.io.File;

backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java → backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java

-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
 import com.alibaba.druid.filter.Filter;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.wall.WallFilter;
 import com.google.gson.Gson;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.dto.datasource.*;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.provider.query.QueryProvider;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;

backend/src/main/java/io/dataease/provider/DDLProvider.java → backend/src/main/java/io/dataease/provider/query/DDLProvider.java

-package io.dataease.provider;
+package io.dataease.provider.query;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/QueryProvider.java → backend/src/main/java/io/dataease/provider/query/QueryProvider.java

-package io.dataease.provider;
+package io.dataease.provider.query;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.pg.PgConstants;
+import io.dataease.provider.query.pg.PgConstants;
 
 import java.util.List;
 

backend/src/main/java/io/dataease/provider/SQLConstants.java → backend/src/main/java/io/dataease/provider/query/SQLConstants.java

-package io.dataease.provider;
+package io.dataease.provider.query;
 
 import java.util.ArrayList;
 import java.util.List;

backend/src/main/java/io/dataease/provider/ck/CKConstants.java → backend/src/main/java/io/dataease/provider/query/ck/CKConstants.java

-package io.dataease.provider.ck;
+package io.dataease.provider.query.ck;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.ck;
+import static io.dataease.commons.constants.DatasourceTypes.ck;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/ck/CKQueryProvider.java → backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java

-package io.dataease.provider.ck;
+package io.dataease.provider.query.ck;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
@@ -10,8 +10,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +27,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/doris/DorisConstants.java → backend/src/main/java/io/dataease/provider/query/doris/DorisConstants.java

-package io.dataease.provider.doris;
+package io.dataease.provider.query.doris;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.de_doris;
+import static io.dataease.commons.constants.DatasourceTypes.de_doris;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/doris/DorisDDLProvider.java → backend/src/main/java/io/dataease/provider/query/doris/DorisDDLProvider.java

-package io.dataease.provider.doris;
+package io.dataease.provider.query.doris;
 
-import io.dataease.provider.DDLProvider;
+import io.dataease.provider.query.DDLProvider;
 import org.springframework.stereotype.Service;
 
 /**

backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java → backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java

-package io.dataease.provider.doris;
+package io.dataease.provider.query.doris;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
@@ -9,9 +9,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.ck.CKConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +26,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java → backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java

-package io.dataease.provider.es;
+package io.dataease.provider.query.es;
 
-import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.domain.Datasource;
@@ -10,9 +9,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.ck.CKConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -28,7 +26,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 @Service("esQuery")
 public class EsQueryProvider extends QueryProvider {
@@ -199,7 +197,7 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -301,27 +299,94 @@ public class EsQueryProvider extends QueryProvider {
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
         if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
         if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
-        return sqlLimit(st.render(), view);
+        return st.render();
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null);
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return null;
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+        List<SQLObj> xFields = new ArrayList<>();
+        List<SQLObj> xWheres = new ArrayList<>();
+        List<SQLObj> xOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(xAxis)) {
+            for (int i = 0; i < xAxis.size(); i++) {
+                ChartViewFieldDTO x = xAxis.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(x.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
+                    originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                } else {
+                    originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                // 处理横轴字段
+                xFields.add(getXFields(x, originField, fieldAlias));
+                // 处理横轴过滤
+//                xWheres.addAll(getXWheres(x, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
+                    xOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(x.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(xFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        wheres.addAll(xWheres);
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        groups.addAll(xFields);
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(xOrders);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("previewSql");
+        st_sql.add("isGroup", false);
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("previewSql");
+        st.add("isGroup", false);
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format(EsSqlLConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return null;
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -426,16 +491,16 @@ public class EsQueryProvider extends QueryProvider {
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
         if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
         if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
-        return sqlLimit(st.render(), view);
+        return st.render();
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -540,12 +605,12 @@ public class EsQueryProvider extends QueryProvider {
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
         if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
         if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
-        return sqlLimit(st.render(), view);
+        return st.render();
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null);
     }
 
     @Override
@@ -554,7 +619,7 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
@@ -622,12 +687,12 @@ public class EsQueryProvider extends QueryProvider {
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
         if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
         if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
-        return sqlLimit(st.render(), view);
+        return st.render();
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList);
     }
 
     @Override
@@ -656,7 +721,7 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String convertTableToSql(String tableName, Datasource ds) {
+    public String convertTableToSql(String tableName, Datasource ds){
         return createSQLPreview("SELECT * FROM " + String.format(EsSqlLConstants.KEYWORD_TABLE, tableName), null);
     }
 

backend/src/main/java/io/dataease/provider/es/EsSqlLConstants.java → backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java

-package io.dataease.provider.es;
+package io.dataease.provider.query.es;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.es;
+import static io.dataease.commons.constants.DatasourceTypes.es;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/mongodb/MongoConstants.java → backend/src/main/java/io/dataease/provider/query/mongodb/MongoConstants.java

-package io.dataease.provider.mongodb;
+package io.dataease.provider.query.mongodb;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.mongo;
-import static io.dataease.datasource.constants.DatasourceTypes.oracle;
+import static io.dataease.commons.constants.DatasourceTypes.mongo;
+import static io.dataease.commons.constants.DatasourceTypes.oracle;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/mongodb/MongoQueryProvider.java → backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java

-package io.dataease.provider.mongodb;
+package io.dataease.provider.query.mongodb;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
@@ -10,9 +10,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.oracle.OracleConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -28,7 +27,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/mysql/MySQLConstants.java → backend/src/main/java/io/dataease/provider/query/mysql/MySQLConstants.java

-package io.dataease.provider.mysql;
+package io.dataease.provider.query.mysql;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.mysql;
+import static io.dataease.commons.constants.DatasourceTypes.mysql;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java → backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java

-package io.dataease.provider.mysql;
+package io.dataease.provider.query.mysql;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
@@ -9,9 +9,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.es.EsSqlLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +26,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/oracle/OracleConstants.java → backend/src/main/java/io/dataease/provider/query/oracle/OracleConstants.java

-package io.dataease.provider.oracle;
+package io.dataease.provider.query.oracle;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.oracle;
+import static io.dataease.commons.constants.DatasourceTypes.oracle;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java → backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java

-package io.dataease.provider.oracle;
+package io.dataease.provider.query.oracle;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.ChartViewWithBLOBs;
@@ -7,13 +7,13 @@ import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
-import io.dataease.datasource.dto.OracleConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
+import io.dataease.dto.datasource.OracleConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +29,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/pg/PgConstants.java → backend/src/main/java/io/dataease/provider/query/pg/PgConstants.java

-package io.dataease.provider.pg;
+package io.dataease.provider.query.pg;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.pg;
+import static io.dataease.commons.constants.DatasourceTypes.pg;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java → backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java

-package io.dataease.provider.pg;
+package io.dataease.provider.query.pg;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.ChartViewWithBLOBs;
@@ -8,13 +8,13 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.sqlserver.SqlServerSQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
+import io.dataease.provider.query.sqlserver.SqlServerSQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -30,7 +30,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 
 @Service("pgQuery")

backend/src/main/java/io/dataease/provider/redshift/RedshiftConstants.java → backend/src/main/java/io/dataease/provider/query/redshift/RedshiftConstants.java

-package io.dataease.provider.redshift;
+package io.dataease.provider.query.redshift;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.pg;
+import static io.dataease.commons.constants.DatasourceTypes.pg;
 
 /**
  * Redshift 静态变量

backend/src/main/java/io/dataease/provider/redshift/RedshiftQueryProvider.java → backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java

-package io.dataease.provider.redshift;
+package io.dataease.provider.query.redshift;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.ChartViewWithBLOBs;
@@ -8,14 +8,14 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.pg.PgConstants;
-import io.dataease.provider.sqlserver.SqlServerSQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
+import io.dataease.provider.query.pg.PgConstants;
+import io.dataease.provider.query.sqlserver.SqlServerSQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 
 /**

backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java → backend/src/main/java/io/dataease/provider/query/sqlserver/SqlServerSQLConstants.java

-package io.dataease.provider.sqlserver;
+package io.dataease.provider.query.sqlserver;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.sqlServer;
+import static io.dataease.commons.constants.DatasourceTypes.sqlServer;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java → backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java

-package io.dataease.provider.sqlserver;
+package io.dataease.provider.query.sqlserver;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.ChartViewWithBLOBs;
@@ -8,12 +8,12 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +29,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 @Service("sqlserverQuery")
 public class SqlserverQueryProvider extends QueryProvider {

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -14,16 +14,16 @@ import io.dataease.commons.utils.LogUtil;
 import io.dataease.controller.request.chart.*;
 import io.dataease.controller.response.ChartDetail;
 import io.dataease.controller.response.DataSetDetail;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.chart.*;
 import io.dataease.dto.dataset.DataSetTableUnionDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
 import io.dataease.i18n.Translator;
 import io.dataease.listener.util.CacheUtils;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.QueryProvider;
 import io.dataease.service.dataset.DataSetTableFieldsService;
 import io.dataease.service.dataset.DataSetTableService;
 import io.dataease.service.dataset.DataSetTableUnionService;

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -16,17 +16,17 @@ import io.dataease.controller.request.dataset.DataSetGroupRequest;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.request.dataset.DataSetTaskRequest;
 import io.dataease.controller.response.DataSetDetail;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.TableFiled;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.JdbcProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.dto.datasource.TableFiled;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.datasource.JdbcProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
 import io.dataease.dto.dataset.*;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
-import io.dataease.provider.DDLProvider;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.DDLProvider;
+import io.dataease.provider.query.QueryProvider;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java

@@ -2,13 +2,12 @@ package io.dataease.service.dataset;
 
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.DatasetTableFunctionMapper;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.service.datasource.DatasourceService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java

@@ -9,18 +9,18 @@ import io.dataease.base.mapper.ext.ExtChartViewMapper;
 import io.dataease.commons.constants.*;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.*;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.JdbcProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.datasource.JdbcProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.dto.datasource.*;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.dataset.DataTableInfoDTO;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.exception.DataEaseException;
 import io.dataease.listener.util.CacheUtils;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.QueryProvider;
 import io.dataease.service.message.DeMsgutil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;

backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java

@@ -5,13 +5,13 @@ import io.dataease.base.domain.DatasetTable;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.commons.utils.CommonBeanFactory;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.dataset.DataSetTableUnionDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.QueryProvider;
 import io.dataease.service.dataset.DataSetFieldService;
 import io.dataease.service.dataset.DataSetTableFieldsService;
 import io.dataease.service.dataset.DataSetTableService;

backend/src/main/java/io/dataease/datasource/service/DatasourceService.java → backend/src/main/java/io/dataease/service/datasource/DatasourceService.java

-package io.dataease.datasource.service;
+package io.dataease.service.datasource;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
@@ -15,13 +15,13 @@ import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
 import io.dataease.dto.DatasourceDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
+import io.dataease.dto.datasource.*;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
 import io.dataease.service.dataset.DataSetGroupService;