(improvement)(headless) refator query code (#658)

This commit is contained in:
jipeli
2024-01-19 17:11:18 +08:00
committed by GitHub
parent 3ba9073a1b
commit 6b5d84a13f
11 changed files with 171 additions and 169 deletions

View File

@@ -12,6 +12,10 @@ import com.tencent.supersonic.common.util.ContextUtils;
import com.tencent.supersonic.common.util.DateModeUtils;
import com.tencent.supersonic.common.util.SqlFilterUtils;
import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.JSQLParserException;
@@ -35,11 +39,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Data
@Slf4j
@@ -268,10 +267,7 @@ public class QueryStructReq extends SemanticQueryReq {
}
public String getModelName() {
if (StringUtils.isNotBlank(modelName)) {
return modelName;
}
return "table";
return Objects.nonNull(modelName) ? modelName : "m_" + String.valueOf(StringUtils.join(modelIds, "_"));
}
}