diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java index 11012ae..f78cebd 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; @Slf4j @RestController @@ -75,5 +76,20 @@ public class ModelController { return OptResult.success(); } + @Operation(summary = "查询生命周期列表") + @GetMapping("/listLifeCycle") + public OptResult listLifeCycle(){ + log.info("查询生命周期列表"); + List> lifeCycleList = modelService.listLifeCycle(); + return OptResult.success(lifeCycleList); + } + + @Operation(summary = "查询数据集列表") + @GetMapping("/listDataset") + public OptResult listDataset(){ + List datasetList = modelService.listDataset(); + return OptResult.success(datasetList); + } + } diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java index fb3106f..c8d5e03 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java @@ -1,9 +1,6 @@ package com.bipt.intelligentapplicationorchestrationservice.mapper; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelInfo; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVO; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersionDTO; +import com.bipt.intelligentapplicationorchestrationservice.pojo.*; import org.apache.ibatis.annotations.*; import java.util.List; @@ -72,4 +69,11 @@ public interface ModelMapper { */ @Update("update model_version set life_cycle=#{dbValue} where id=#{id}") int updateLifeCycleById(Long id, String dbValue); + + /** + * 查询数据集列表 + * @return + */ + @Select("select dataset_id,dataset_name from dataset") + List listDataset(); } diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java index cc8d32a..8b25ff1 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java @@ -12,7 +12,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Service @@ -145,4 +148,21 @@ public class ModelServiceImpl implements ModelService { log.info("模型生命周期更新成功,新状态为: {}", targetLifeCycle); } + @Override + public List> listLifeCycle() { + return Arrays.stream(ModelLifecycle.values()) + .map(lifecycle -> Map.of( + "code", lifecycle.name(), // 枚举名称(如 "DESIGNING") + "description", lifecycle.getDescription() // 中文描述(如 "设计中") + )) + .collect(Collectors.toList()); + } + + @Override + public List listDataset() { + List datasetEntityList = modelMapper.listDataset(); + return datasetEntityList; + + } + } diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java index 0933085..dc468f0 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java @@ -1,11 +1,9 @@ package com.bipt.intelligentapplicationorchestrationservice.service; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelDTO; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVO; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion; -import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersionDTO; +import com.bipt.intelligentapplicationorchestrationservice.pojo.*; import java.util.List; +import java.util.Map; public interface ModelService { void createModel(ModelDTO dto); @@ -21,4 +19,8 @@ public interface ModelService { void deleteModelVersion(Long id); void updateLifeCycle(Long id, String lifeCycle); + + List> listLifeCycle(); + + List listDataset(); }