diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/AlgorithmInfoController.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/AlgorithmInfoController.java index 5a6d6ca..4fb6cfa 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/AlgorithmInfoController.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/AlgorithmInfoController.java @@ -78,11 +78,18 @@ public class AlgorithmInfoController { */ @PostMapping("/run/{id}") @Operation(summary = "运行") - public OptResult run(@PathVariable Long id){ + public OptResult run(@PathVariable Long id,String param){ log.info("运行",id); - algorithmInfoService.run(id); + algorithmInfoService.run(id,param); return OptResult.success("运行成功"); } - + /** + * 前端列表返回算法名称 + */ + @GetMapping("/names") + @Operation(summary = "列表返回算法名称") + public List getNames(){ + return algorithmInfoService.getAllNames(); + } } \ No newline at end of file diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/AlgorithmInfoMapper.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/AlgorithmInfoMapper.java index 7d54f14..c0895e3 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/AlgorithmInfoMapper.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/AlgorithmInfoMapper.java @@ -33,4 +33,6 @@ public interface AlgorithmInfoMapper { String getDescriptionById(Long id); @Select("select algorithm_file from algorithm_info where id = #{id}") String getFileById(Long id); + @Select("select algorithm_name from algorithm_info") + List getAllNames(); } \ No newline at end of file diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/AlgorithmInfoService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/AlgorithmInfoService.java index c02aa48..02f0f63 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/AlgorithmInfoService.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/AlgorithmInfoService.java @@ -14,5 +14,7 @@ public interface AlgorithmInfoService { void save(AlgorithmInfo algorithmInfo); - void run(Long id); + void run(Long id,String param); + + List getAllNames(); } \ No newline at end of file diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/AlgorithmInfoServiceImpl.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/AlgorithmInfoServiceImpl.java index b33ca5f..742e28c 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/AlgorithmInfoServiceImpl.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/AlgorithmInfoServiceImpl.java @@ -88,8 +88,8 @@ public class AlgorithmInfoServiceImpl implements AlgorithmInfoService { * @param id */ @Override - public void run(Long id) { - String description = algorithmInfoMapper.getDescriptionById(id); + public void run(Long id,String param) { + /*String description = algorithmInfoMapper.getDescriptionById(id);*/ /*//拿到传入的描述,并且用逗号分隔 String[] commaParts = description.split(","); @@ -107,7 +107,7 @@ public class AlgorithmInfoServiceImpl implements AlgorithmInfoService { String file = algorithmInfoMapper.getFileById(id); try { // 构建命令,将 param 作为参数传递给 Python 脚本 - ProcessBuilder pb = new ProcessBuilder("python", file, description); + ProcessBuilder pb = new ProcessBuilder("python", file, param); // 设置工作目录(如果 Python 脚本不在当前目录) // pb.directory(new File("/path/to/script")); @@ -136,4 +136,9 @@ public class AlgorithmInfoServiceImpl implements AlgorithmInfoService { } } + + @Override + public List getAllNames() { + return algorithmInfoMapper.getAllNames(); + } } \ No newline at end of file