Merge pull request #164 from dataease/pr@dev@feat_同步数据集预览数据从doris中取

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

@@ -282,52 +282,101 @@ public class DataSetTableService {
             realSize = Integer.parseInt(dataSetTableRequest.getRow()) % pageSize;
         }
         if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) {
-            Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
-            if (ObjectUtils.isEmpty(ds)) {
-                throw new RuntimeException(Translator.get("i18n_datasource_delete"));
+            if (datasetTable.getMode() == 0) {
+                Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
+                if (ObjectUtils.isEmpty(ds)) {
+                    throw new RuntimeException(Translator.get("i18n_datasource_delete"));
+                }
+                DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
+                DatasourceRequest datasourceRequest = new DatasourceRequest();
+                datasourceRequest.setDatasource(ds);
+                String table = dataTableInfoDTO.getTable();
+                QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
+                datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize));
+                try {
+                    data.addAll(datasourceProvider.getData(datasourceRequest));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                try {
+                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow())));
+                    dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                // check doris table
+                if (!checkDorisTableIsExists(dataSetTableRequest.getId())) {
+                    throw new RuntimeException(Translator.get("i18n_data_not_sync"));
+                }
+                Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
+                JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
+                DatasourceRequest datasourceRequest = new DatasourceRequest();
+                datasourceRequest.setDatasource(ds);
+                String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
+                QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
+                datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize));
+                try {
+                    data.addAll(jdbcProvider.getData(datasourceRequest));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                try {
+                    datasourceRequest.setQuery(qp.createQueryCountSQL(table));
+                    dataSetPreviewPage.setTotal(Integer.valueOf(jdbcProvider.getData(datasourceRequest).get(0)[0]));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
-            DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
-            DatasourceRequest datasourceRequest = new DatasourceRequest();
-            datasourceRequest.setDatasource(ds);
 
-            String table = dataTableInfoDTO.getTable();
-            QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-            datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize));
-            try {
-                data.addAll(datasourceProvider.getData(datasourceRequest));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            try {
-                datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow())));
-                dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) {
-            Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
-            if (ObjectUtils.isEmpty(ds)) {
-                throw new RuntimeException(Translator.get("i18n_datasource_delete"));
-            }
-            DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
-            DatasourceRequest datasourceRequest = new DatasourceRequest();
-            datasourceRequest.setDatasource(ds);
+            if (datasetTable.getMode() == 0) {
+                Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
+                if (ObjectUtils.isEmpty(ds)) {
+                    throw new RuntimeException(Translator.get("i18n_datasource_delete"));
+                }
+                DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
+                DatasourceRequest datasourceRequest = new DatasourceRequest();
+                datasourceRequest.setDatasource(ds);
 
-            String sql = dataTableInfoDTO.getSql();
-            QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-            datasourceRequest.setQuery(qp.createQuerySQLAsTmpWithPage(sql, fields, page, pageSize, realSize));
-            System.out.println(datasourceRequest.getQuery());
-            try {
-                data.addAll(datasourceProvider.getData(datasourceRequest));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            try {
-                datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow())));
+                String sql = dataTableInfoDTO.getSql();
+                QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
+                datasourceRequest.setQuery(qp.createQuerySQLAsTmpWithPage(sql, fields, page, pageSize, realSize));
                 System.out.println(datasourceRequest.getQuery());
-                dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
-            } catch (Exception e) {
-                e.printStackTrace();
+                try {
+                    data.addAll(datasourceProvider.getData(datasourceRequest));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                try {
+                    datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow())));
+                    dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                // check doris table
+                if (!checkDorisTableIsExists(dataSetTableRequest.getId())) {
+                    throw new RuntimeException(Translator.get("i18n_data_not_sync"));
+                }
+                Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
+                JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
+                DatasourceRequest datasourceRequest = new DatasourceRequest();
+                datasourceRequest.setDatasource(ds);
+                String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
+                QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
+                datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize));
+                try {
+                    data.addAll(jdbcProvider.getData(datasourceRequest));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                try {
+                    datasourceRequest.setQuery(qp.createQueryCountSQL(table));
+                    dataSetPreviewPage.setTotal(Integer.valueOf(jdbcProvider.getData(datasourceRequest).get(0)[0]));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
             if (StringUtils.isEmpty(datasetTable.getSyncStatus()) || datasetTable.getSyncStatus().equalsIgnoreCase(JobStatus.Underway.name())) {
@@ -363,7 +412,6 @@ public class DataSetTableService {
                     e.printStackTrace();
                 }
             }
-
         } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
             Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
             JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);

backend/src/main/resources/i18n/messages_en_US.properties

@@ -265,4 +265,5 @@ i18n_schema_is_empty=Database schema is empty
 站内消息=Internal Messages
 所有消息=All Messages
 未读消息=Unread Messages
-已读消息=Read Messages
\ No newline at end of file
+已读消息=Read Messages
+i18n_data_not_sync=Please sync data first
\ No newline at end of file

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -265,3 +265,4 @@ i18n_schema_is_empty=数据库 Schema 为空
 所有消息=所有消息
 未读消息=未读消息
 已读消息=已读消息
+i18n_data_not_sync=请先完成数据同步

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -267,4 +267,5 @@ i18n_schema_is_empty=數據庫 Schema 為空
 站内消息=站內消息
 所有消息=所有消息
 未读消息=未讀消息
-已读消息=已讀消息
\ No newline at end of file
+已读消息=已讀消息
+i18n_data_not_sync=請先完成數據同步
\ No newline at end of file

frontend/src/views/chart/components/shape-attr/LabelSelector.vue

@@ -34,7 +34,7 @@
                   <span>{{ $t('chart.content_formatter') }}</span>
                   <el-tooltip class="item" effect="dark" placement="bottom">
                     <div slot="content">
-                      字符串支持用 \n 换行<br>字符串模板 模板变量有：<br>{a}：系列名。<br>{b}：数据名。<br>{c}：数据值。<br>{d}：百分比（用于饼图等）。
+                      字符串模板 模板变量有：<br>{a}：系列名。<br>{b}：数据名。<br>{c}：数据值。<br>{d}：百分比（用于饼图等）。
                     </div>
                     <i class="el-icon-info" style="cursor: pointer;" />
                   </el-tooltip>

frontend/src/views/dataset/data/ViewTable.vue

 <template>
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-    <span v-show="false">{{ tableRefresh }}</span>
+<!--    <span v-show="false">{{ tableRefresh }}</span>-->
     <el-row style="height: 26px;">
       <el-popover
         placement="right-start"
@@ -94,10 +94,10 @@ export default {
     }
   },
   computed: {
-    tableRefresh() {
-      this.initTable(this.param)
-      return this.$store.state.dataset.table
-    }
+    // tableRefresh() {
+    //   this.initTable(this.param)
+    //   return this.$store.state.dataset.table
+    // }
   },
   watch: {
     'param': function() {