(improvement)(Headless) Refactor ChatLayerService and SemanticLayerService (#1404)

Co-authored-by: lxwcodemonkey
This commit is contained in:
LXW
2024-07-14 11:23:47 +08:00
committed by GitHub
parent baff30550e
commit 407c8d4702
16 changed files with 496 additions and 514 deletions

View File

@@ -1,14 +1,16 @@
package com.tencent.supersonic.headless.api.pojo;
import lombok.Data;
import org.apache.commons.collections.CollectionUtils;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.Data;
import org.apache.commons.collections.CollectionUtils;
@Data
public class DataSetSchema {
@@ -57,6 +59,14 @@ public class DataSetSchema {
}
}
public Map<String, String> getBizNameToName() {
List<SchemaElement> allElements = new ArrayList<>();
allElements.addAll(getDimensions());
allElements.addAll(getMetrics());
return allElements.stream()
.collect(Collectors.toMap(SchemaElement::getBizName, SchemaElement::getName, (k1, k2) -> k1));
}
public TimeDefaultConfig getTagTypeTimeDefaultConfig() {
if (queryConfig == null) {
return null;

View File

@@ -150,14 +150,6 @@ public class SemanticSchema implements Serializable {
return dataSets;
}
public Map<String, String> getBizNameToName(Long dataSetId) {
List<SchemaElement> allElements = new ArrayList<>();
allElements.addAll(getDimensions(dataSetId));
allElements.addAll(getMetrics(dataSetId));
return allElements.stream()
.collect(Collectors.toMap(SchemaElement::getBizName, SchemaElement::getName, (k1, k2) -> k1));
}
public Map<Long, DataSetSchema> getDataSetSchemaMap() {
if (CollectionUtils.isEmpty(dataSetSchemaList)) {
return new HashMap<>();

View File

@@ -1,6 +1,8 @@
package com.tencent.supersonic.headless.api.pojo.request;
import com.tencent.supersonic.common.pojo.DateConf;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import javax.validation.constraints.NotNull;
import java.util.Set;
@@ -21,4 +23,11 @@ public class DimensionValueReq {
private Set<Long> dataSetIds;
private DateConf dateInfo = new DateConf();
private String dimensionBizName;
public String getBizName() {
return StringUtils.isBlank(bizName) ? dimensionBizName : bizName;
}
}

View File

@@ -1,16 +0,0 @@
package com.tencent.supersonic.headless.api.pojo.request;
import com.tencent.supersonic.common.pojo.DateConf;
import lombok.Data;
import lombok.ToString;
@Data
@ToString
public class QueryDimValueReq {
private Long modelId;
private String dimensionBizName;
private String value;
private DateConf dateInfo = new DateConf();
}