From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 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 84fe38d..4e53127 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
@@ -47,24 +47,6 @@
@Autowired
private ModelRbdNodeService modelRbdNodeService;
- @Autowired
- 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("鍒嗛〉")
@@ -145,4 +127,12 @@
return result ? Result.ok() : Result.error("瑙ｆ瀽澶辫触");
}
+ @PostMapping("layout")
+ @ApiOperation("鑷姩鎺掔増")
+ @LogOperation("鑷姩鎺掔増")
+ public Result<ModelRbd> layout(@RequestBody ModelRbd modelRbd) {
+ boolean result = modelLineService.layout(modelRbd);
+ return result ? Result.ok(modelRbd) : Result.error("鑷姩鎺掔増澶辫触");
+ }
+
}
--
Gitblit v1.9.1