diff --git a/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java index 373b580..506d66d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java @@ -189,7 +189,7 @@ public class PatientScriptServiceImpl implements PatientScriptService { @Override - public Boolean save(PatientScript patientScript) throws IOException, InterruptedException, TemplateException { + public Boolean save(PatientScript patientScript) { try { patientScript.setStatus("生成中"); scriptMapper.updateStatus(patientScript); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java index 2204168..78a32b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java @@ -79,7 +79,7 @@ public class ShellUtil { // 如果命令执行失败,可以选择停止执行后续命令 if (exitCode != 0) { System.out.println("Command failed, stopping script execution"); - break; + throw new Exception("Command failed"); } } diff --git a/ruoyi-admin/src/main/resources/static/cpacSh.ftl b/ruoyi-admin/src/main/resources/static/cpacSh.ftl index 23e9f00..6acb19a 100644 --- a/ruoyi-admin/src/main/resources/static/cpacSh.ftl +++ b/ruoyi-admin/src/main/resources/static/cpacSh.ftl @@ -12,7 +12,7 @@ cp Node_AAL116.node config.mat config2.mat config3.mat config4.mat BrainMesh_Ch2 python ${matrixPath}main.py --sub_id ${subId} --root_dir ${fmriOutPath} --module_dir /data/config/models_9_9 --matrix_path ${matrixPath} -python ${matrixPath}number_change_script.py --age ${age} +python ${matrixPath}number_change_script.py --age ${age} --matrix_path ${matrixPath} python ${matrixPath}extract_regions.py echo "main handle end!" diff --git a/ruoyi-admin/src/main/resources/static/dti/cpac-dti.ftl b/ruoyi-admin/src/main/resources/static/dti/cpac-dti.ftl index cce6c5b..d0c4f68 100644 --- a/ruoyi-admin/src/main/resources/static/dti/cpac-dti.ftl +++ b/ruoyi-admin/src/main/resources/static/dti/cpac-dti.ftl @@ -14,7 +14,7 @@ cp Node_AAL116.node config.mat config2.mat config3.mat config4.mat BrainMesh_Ch2 python ${matrixPath}main_dti.py --sub_id ${subId} --root_dir ${fmriOutPath} --module_dir /data/config/models_0_0 --matrix_path ${matrixPath} -python ${matrixPath}number_change_script.py --age ${age} +python ${matrixPath}number_change_script.py --age ${age} --matrix_path ${matrixPath} python ${matrixPath}extract_regions.py echo "main handle end!"