feat(数据集):时间转换

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

@@ -58,11 +58,6 @@ public class DataSetTableController {
         return dataSetTableService.getFieldsFromDE(dataSetTableRequest);
     }
 
-    @PostMapping("getData")
-    public List<String[]> getData(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
-        return dataSetTableService.getData(dataSetTableRequest);
-    }
-
     @PostMapping("getPreviewData/{page}/{pageSize}")
     public Map<String, Object> getPreviewData(@RequestBody DataSetTableRequest dataSetTableRequest, @PathVariable Integer page, @PathVariable Integer pageSize) throws Exception {
         return dataSetTableService.getPreviewData(dataSetTableRequest, page, pageSize);

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

@@ -270,6 +270,15 @@ public class ChartViewService {
             f.append(" AS _").append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getDataeaseName(), "*") ? "" : y.getDataeaseName());
             return f.toString();
         }).toArray(String[]::new);
+        String[] groupField = xAxis.stream().map(x -> {
+            StringBuilder stringBuilder = new StringBuilder();
+            if (x.getDeType() == 1) {
+                stringBuilder.append("FROM_UNIXTIME(cast(").append(x.getDataeaseName()).append(" as decimal(20,0))/1000,'%Y-%m-%d %H:%i:%S') as ").append(x.getDataeaseName());
+            } else {
+                stringBuilder.append(x.getDataeaseName());
+            }
+            return stringBuilder.toString();
+        }).toArray(String[]::new);
         String[] group = xAxis.stream().map(ChartViewFieldDTO::getDataeaseName).toArray(String[]::new);
         String[] xOrder = xAxis.stream().filter(f -> StringUtils.isNotEmpty(f.getSort()) && !StringUtils.equalsIgnoreCase(f.getSort(), "none"))
                 .map(f -> f.getDataeaseName() + " " + f.getSort()).toArray(String[]::new);
@@ -297,7 +306,7 @@ public class ChartViewService {
                 }).toArray(String[]::new);
 
         String sql = MessageFormat.format("SELECT {0},{1} FROM {2} WHERE 1=1 {3} GROUP BY {4} ORDER BY null,{5}",
-                StringUtils.join(group, ","),
+                StringUtils.join(groupField, ","),
                 StringUtils.join(field, ","),
                 table,
                 xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "" + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter

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

@@ -124,7 +124,6 @@ public class DataSetTableService {
         String dorisTableName = DorisTableUtils.dorisName(datasetId);
         Datasource dorisDatasource = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
         JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
-        ;
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(dorisDatasource);
         datasourceRequest.setQuery("drop table if exists " + dorisTableName);
@@ -199,23 +198,6 @@ public class DataSetTableService {
         return map;
     }
 
-    public List<String[]> getData(DataSetTableRequest dataSetTableRequest) throws Exception {
-        Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
-        DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
-        DatasourceRequest datasourceRequest = new DatasourceRequest();
-        datasourceRequest.setDatasource(ds);
-        String table = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable();
-
-        DatasetTableField datasetTableField = DatasetTableField.builder().build();
-        datasetTableField.setTableId(dataSetTableRequest.getId());
-        datasetTableField.setChecked(Boolean.TRUE);
-        List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
-        String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new);
-        datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray));
-
-        return datasourceProvider.getData(datasourceRequest);
-    }
-
     public Map<String, Object> getPreviewData(DataSetTableRequest dataSetTableRequest, Integer page, Integer pageSize) throws Exception {
         DatasetTableField datasetTableField = DatasetTableField.builder().build();
         datasetTableField.setTableId(dataSetTableRequest.getId());
@@ -242,7 +224,7 @@ public class DataSetTableService {
             datasourceRequest.setDatasource(ds);
 
             String table = dataTableInfoDTO.getTable();
-            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
+            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
             try {
                 data.addAll(datasourceProvider.getData(datasourceRequest));
             } catch (Exception e) {
@@ -261,7 +243,7 @@ public class DataSetTableService {
             datasourceRequest.setDatasource(ds);
 
             String sql = dataTableInfoDTO.getSql();
-            datasourceRequest.setQuery(createQuerySQL(ds.getType(), " (" + sql + ") AS tmp ", fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
+            datasourceRequest.setQuery(createQuerySQL(ds.getType(), " (" + sql + ") AS tmp ", fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
             try {
                 data.addAll(datasourceProvider.getData(datasourceRequest));
             } catch (Exception e) {
@@ -279,7 +261,7 @@ public class DataSetTableService {
             DatasourceRequest datasourceRequest = new DatasourceRequest();
             datasourceRequest.setDatasource(ds);
             String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
-            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
+            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
             try {
                 data.addAll(jdbcProvider.getData(datasourceRequest));
             } catch (Exception e) {
@@ -298,7 +280,7 @@ public class DataSetTableService {
             DatasourceRequest datasourceRequest = new DatasourceRequest();
             datasourceRequest.setDatasource(ds);
             String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
-            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
+            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
             try {
                 data.addAll(jdbcProvider.getData(datasourceRequest));
             } catch (Exception e) {
@@ -568,15 +550,25 @@ public class DataSetTableService {
         }
     }
 
-    public String createQuerySQL(String type, String table, String[] fields) {
+    public String createQuerySQL(String type, String table, List<DatasetTableField> fields) {
+        String[] array = fields.stream().map(f -> {
+            StringBuilder stringBuilder = new StringBuilder();
+            if (f.getDeType() == 1) {
+                stringBuilder.append("FROM_UNIXTIME(cast(").append(f.getDataeaseName()).append(" as decimal(20,0))/1000,'%Y-%m-%d %H:%i:%S') as ").append(f.getDataeaseName());
+            } else {
+                stringBuilder.append(f.getDataeaseName());
+            }
+            return stringBuilder.toString();
+        }).toArray(String[]::new);
+
         DatasourceTypes datasourceType = DatasourceTypes.valueOf(type);
         switch (datasourceType) {
             case mysql:
-                return MessageFormat.format("SELECT {0} FROM {1} ORDER BY " + (fields.length > 0 ? fields[0] : "null"), StringUtils.join(fields, ","), table);
+                return MessageFormat.format("SELECT {0} FROM {1} ORDER BY " + (fields.size() > 0 ? fields.get(0).getDataeaseName() : "null"), StringUtils.join(array, ","), table);
             case sqlServer:
-                return MessageFormat.format("SELECT {0} FROM {1} ORDER BY " + (fields.length > 0 ? fields[0] : "null"), StringUtils.join(fields, ","), table);
+                return MessageFormat.format("SELECT {0} FROM {1} ORDER BY " + (fields.size() > 0 ? fields.get(0).getDataeaseName() : "null"), StringUtils.join(array, ","), table);
             default:
-                return MessageFormat.format("SELECT {0} FROM {1} ORDER BY " + (fields.length > 0 ? fields[0] : "null"), StringUtils.join(fields, ","), table);
+                return MessageFormat.format("SELECT {0} FROM {1} ORDER BY " + (fields.size() > 0 ? fields.get(0).getDataeaseName() : "null"), StringUtils.join(array, ","), table);
         }
     }
 

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

@@ -435,7 +435,7 @@ public class ExtractDataService {
                 transMeta.addDatabase(dataMeta);
                 if(extractType.equalsIgnoreCase("all_scope")){
                     String tableName = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable();
-                    selectSQL = dataSetTableService.createQuerySQL(datasource.getType(), tableName, datasetTableFields.stream().map(DatasetTableField::getDataeaseName).toArray(String[]::new));
+                    selectSQL = dataSetTableService.createQuerySQL(datasource.getType(), tableName, datasetTableFields);
                 }
                 inputStep = inputStep(transMeta, selectSQL);
                 break;

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,18 +47,18 @@ public class DirectFieldService implements DataSetFieldService {
 
         DatasetTableField field = list.get(0);
         String tableId = field.getTableId();
-        if (StringUtils.isEmpty(tableId))return null;
+        if (StringUtils.isEmpty(tableId)) return null;
         DatasetTable datasetTable = dataSetTableService.get(tableId);
         if (ObjectUtils.isEmpty(datasetTable) || StringUtils.isEmpty(datasetTable.getName())) return null;
         String tableName = datasetTable.getName();
 
         String dataSourceId = datasetTable.getDataSourceId();
-        if( StringUtils.isEmpty(dataSourceId)) return null;
+        if (StringUtils.isEmpty(dataSourceId)) return null;
         Datasource ds = datasourceService.get(dataSourceId);
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(ds);
-        String querySQL = dataSetTableService.createQuerySQL(ds.getType(), tableName, new String[]{field.getOriginName()});
+        String querySQL = dataSetTableService.createQuerySQL(ds.getType(), tableName, Collections.singletonList(field));
         datasourceRequest.setQuery(querySQL);
         try {
             List<String[]> rows = datasourceProvider.getData(datasourceRequest);