优化数据表和字段校验逻辑+服务详情

src/main/java/com/hisense/dataservice/controller/DataServiceManagementController.java

@@ -7,6 +7,7 @@ import com.hisense.dataservice.library.model.page.PageLink;
 import com.hisense.dataservice.service.DataApiCommonService;
 import com.hisense.dataservice.service.DataApiDataSourceManagementService;
 import com.hisense.dataservice.service.DataApiServiceManagementService;
+import com.hisense.dataservice.vo.DataApiModelDetailVo;
 import com.hisense.dataservice.vo.DataApiModelItemVo;
 import com.hisense.dataservice.vo.DataTableVo;
 import io.swagger.annotations.Api;
@@ -76,6 +77,17 @@ public class DataServiceManagementController extends BaseController {
         return dataApiServiceManagementService.queryDataApiList(environment, status, pageLink);
     }
 
+    @ApiOperation(value = "数据服务管理-服务详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "environment", value = "环境", required = true),
+            @ApiImplicitParam(name = "modelId", value = "数据服务ID", required = true)
+    })
+    @GetMapping("/{environment}/{modelId}")
+    public Result<DataApiModelDetailVo> getApiModelDetail(@PathVariable String environment,
+                                                              @PathVariable Long modelId) {
+        return dataApiServiceManagementService.queryApiModelDetail(environment, modelId);
+    }
+
 
     @GetMapping("/dataFileDownload/{environment}/{pattern}/{fileId}")
     public Object dataFileDownload(@PathVariable String environment, @PathVariable String pattern, @PathVariable String fileId) {

src/main/java/com/hisense/dataservice/repository/DataApiColumnRepository.java

@@ -28,4 +28,6 @@ public interface DataApiColumnRepository extends JpaRepository<DataApiColumn,Lon
 
     // 判断数据表中是否存在某个字段
     boolean existsByDataTableIdAndFieldName(Long dataTableId,String fileName);
+
+    List<DataApiColumn> findAllByDataTableIdIn(Iterable<Long> tableIds);
 }

src/main/java/com/hisense/dataservice/service/DataApiServiceManagementService.java

@@ -5,6 +5,7 @@ import com.hisense.dataservice.dto.DataApiModelDto;
 import com.hisense.dataservice.library.model.Result;
 import com.hisense.dataservice.library.model.page.PageData;
 import com.hisense.dataservice.library.model.page.PageLink;
+import com.hisense.dataservice.vo.DataApiModelDetailVo;
 import com.hisense.dataservice.vo.DataApiModelItemVo;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface DataApiServiceManagementService extends BaseService {
     Result<JSONObject> debugDataApiService(String environment, Long dataModelId);
 
     Result<PageData<DataApiModelItemVo>> queryDataApiList(String environment, Integer status, PageLink pageLink);
+
+    Result<DataApiModelDetailVo> queryApiModelDetail(String environment, Long modelId);
 }

src/main/java/com/hisense/dataservice/vo/DataApiModelDetailVo.java

@@ -29,6 +29,9 @@ public class DataApiModelDetailVo {
     @ApiModelProperty(name = "数据服务描述")
     private String description;
 
+    @ApiModelProperty(name = "数据源类型")
+    private String dataSourceId;
+
     @ApiModelProperty(name = "发布/创建人")
     private String creator;
 

src/test/java/com/hisense/dataservice/service/DataApiServiceManagementServiceTest.java

@@ -91,6 +91,13 @@ public class DataApiServiceManagementServiceTest {
 
     }
 
+    @Test
+    public void test(){
+        Result<JSONObject> result5 = dataApiServiceManagementService.debugDataApiService("DEV", 541L);
+        log.info("执行调试；第五步结果，调试api：{}", result5);
+        Assert.assertEquals(null, result5.getData());
+    }
+
     private DataApiModelDto buildModelDtoForServiceCreate(){
         DataApiModelDto dataApiModelDto = new DataApiModelDto();
         dataApiModelDto.setModelName("测试模式名称");