Merge 66ad18f4d3 into 79a44b27ee

headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 
 @RestController
@@ -50,10 +51,8 @@ public class DataSetController {
 
     @GetMapping("/getDataSetList")
     public List<DataSetResp> getDataSetList(@RequestParam("domainId") Long domainId) {
-        MetaFilter metaFilter = new MetaFilter();
+        List<Integer> statuCodeList = Arrays.asList(StatusEnum.ONLINE.getCode(),StatusEnum.OFFLINE.getCode());
-        metaFilter.setDomainId(domainId);
+        return dataSetService.getDataSetList(domainId,statuCodeList);
-        metaFilter.setStatus(StatusEnum.ONLINE.getCode());
-        return dataSetService.getDataSetList(metaFilter);
     }
 
     @DeleteMapping("/{id}")

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java

@@ -20,6 +20,8 @@ public interface DataSetService {
 
     List<DataSetResp> getDataSetList(MetaFilter metaFilter);
 
+    List<DataSetResp> getDataSetList(Long domainId ,List<Integer> statuCodesList);
+
     void delete(Long id, User user);
 
     Map<Long, List<Long>> getModelIdToDataSetIds(List<Long> dataSetIds, User user);

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java

@@ -102,6 +102,20 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
         return list(wrapper).stream().map(this::convert).collect(Collectors.toList());
     }
 
+    @Override
+    public List<DataSetResp> getDataSetList(Long domainId, List<Integer> statuCodesList) {
+        if(domainId==null || CollectionUtils.isEmpty(statuCodesList)){
+            return List.of();
+        }
+        QueryWrapper<DataSetDO> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(DataSetDO::getDomainId, domainId);
+        wrapper.lambda().in(DataSetDO::getStatus, statuCodesList);
+        wrapper.lambda().ne(DataSetDO::getStatus, StatusEnum.DELETED.getCode());
+
+        return list(wrapper).stream().map(this::convert).collect(Collectors.toList());
+
+    }
+
     @Override
     public void delete(Long id, User user) {
         DataSetDO dataSetDO = getById(id);

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

@@ -138,7 +138,8 @@ public class DictUtils {
         semanticQueryReq.setNeedAuth(false);
         String bizName = dictItemResp.getBizName();
         try {
-            SemanticQueryResp semanticQueryResp = queryService.queryByReq(semanticQueryReq, null);
+            SemanticQueryResp semanticQueryResp =
+                    queryService.queryByReq(semanticQueryReq, User.getDefaultUser());
             if (Objects.isNull(semanticQueryResp)
                     || CollectionUtils.isEmpty(semanticQueryResp.getResultList())) {
                 return lines;
@@ -274,7 +275,7 @@ public class DictUtils {
     private QuerySqlReq constructQuerySqlReq(DictItemResp dictItemResp) {
 
         ModelResp model = modelService.getModel(dictItemResp.getModelId());
-        String tableStr = model.getModelDetail().getTableQuery() != null
+        String tableStr = StringUtils.isNotBlank(model.getModelDetail().getTableQuery())
                 ? model.getModelDetail().getTableQuery()
                 : "(" + model.getModelDetail().getSqlQuery() + ")";
         String sqlPattern =