From f6cdad43a14ca0fc362b6b8846f7fb8e362043f0 Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期四, 06 六月 2024 10:27:15 +0800 Subject: [PATCH] svgEditor --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java index ab40255..f305c0a 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java @@ -12,6 +12,7 @@ import com.zt.common.validator.group.AddGroup; import com.zt.common.validator.group.DefaultGroup; import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.mainPart.async.PythonLib; import com.zt.life.modules.mainPart.taskReliability.model.ModelLine; import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd; import com.zt.life.modules.mainPart.taskReliability.service.ModelLineService; @@ -43,7 +44,23 @@ private ModelLineService modelLineService; @Autowired -// private PythonLib pythonLib; + private PythonLib pythonLib; + + @GetMapping("callPythonCalc") + @ApiOperation("淇℃伅") + public Result callPythonCalc() { + Result result = pythonLib.callPython(); + + return result; + } + + @GetMapping("getPythonCalcResult") + @ApiOperation("淇℃伅") + public Result<String> getPythonCalcResult() { + String result = pythonLib.getPythonCalcResult(); + + return Result.ok(result); + } @GetMapping("page") @ApiOperation("鍒嗛〉") @@ -76,24 +93,6 @@ } return Result.ok(data); } - -/* - @GetMapping("callPythonCalc") - @ApiOperation("淇℃伅") - public Result callPythonCalc() { - pythonLib.callPython(); - - return Result.ok(); - } - - @GetMapping("getPythonCalcResult") - @ApiOperation("淇℃伅") - public Result<String> getPythonCalcResult() { - String result = pythonLib.getPythonCalcResult(); - - return Result.ok(result); - } -*/ @PostMapping @ApiOperation("鏂板") -- Gitblit v1.9.1