Merge 9db9718e88 into 37673c82da

headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java

@@ -102,7 +102,7 @@ public class DimValueAspect {
                 continue;
             }
             for (DimensionResp dimension : dimensions) {
-                if (!expression.getFieldName().equals(dimension.getBizName())
+                if (!expression.getFieldName().equals(dimension.getName())
                         || CollectionUtils.isEmpty(dimension.getDimValueMaps())) {
                     continue;
                 }
@@ -124,7 +124,6 @@ public class DimValueAspect {
         sql = SqlReplaceHelper.replaceValue(sql, filedNameToValueMap);
         log.debug("correctorSql after replacing:{}", sql);
         querySqlReq.setSql(sql);
-        querySqlReq.getSqlInfo().setQuerySQL(sql);
         Map<String, Map<String, String>> techNameToBizName = getTechNameToBizName(dimensions);
 
         SemanticQueryResp queryResultWithColumns = (SemanticQueryResp) joinPoint.proceed();

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java

@@ -19,10 +19,9 @@ public class DataSetSchemaBuilder {
     public static DataSetSchema build(DataSetSchemaResp resp) {
         DataSetSchema dataSetSchema = new DataSetSchema();
         dataSetSchema.setQueryConfig(resp.getQueryConfig());
-        SchemaElement dataSet =
+        SchemaElement dataSet = SchemaElement.builder().dataSetId(resp.getId())
-                SchemaElement.builder().dataSetId(resp.getId()).dataSetName(resp.getName())
+                .dataSetName(resp.getName()).id(resp.getId()).name(resp.getName())
-                        .id(resp.getId()).name(resp.getName()).description(resp.getDescription())
+                .bizName(resp.getBizName()).type(SchemaElementType.DATASET).build();
-                        .bizName(resp.getBizName()).type(SchemaElementType.DATASET).build();
         dataSetSchema.setDataSet(dataSet);
         dataSetSchema.setDatabaseType(resp.getDatabaseType());
         dataSetSchema.setDatabaseVersion(resp.getDatabaseVersion());

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java

@@ -274,8 +274,6 @@ public class DictUtils {
     private QuerySqlReq constructQuerySqlReq(DictItemResp dictItemResp) {
 
         ModelResp model = modelService.getModel(dictItemResp.getModelId());
-        String tableStr = model.getModelDetail().getTableQuery() != null ? model.getModelDetail().getTableQuery()
-                : "(" + model.getModelDetail().getSqlQuery() + ")";
         String sqlPattern =
                 "select %s,count(1) from %s %s group by %s order by count(1) desc limit %d";
         String dimBizName = dictItemResp.getBizName();
@@ -290,7 +288,7 @@ public class DictUtils {
         }
 
         String sql =
-                String.format(sqlPattern, dimBizName, tableStr, where, dimBizName, limit);
+                String.format(sqlPattern, dimBizName, model.getBizName(), where, dimBizName, limit);
         Set<Long> modelIds = new HashSet<>();
         modelIds.add(dictItemResp.getModelId());
         QuerySqlReq querySqlReq = new QuerySqlReq();