From 27bf11e737fa1434d234e39db282ab52f3a32114 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 27 九月 2024 14:22:19 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 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..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
@@ -12,9 +12,11 @@
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;
+import com.zt.life.modules.mainPart.taskReliability.service.ModelRbdNodeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -43,7 +45,8 @@
private ModelLineService modelLineService;
@Autowired
-// private PythonLib pythonLib;
+ private ModelRbdNodeService modelRbdNodeService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -77,24 +80,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("鏂板")
@LogOperation("鏂板")
@@ -103,8 +88,8 @@
ValidatorUtils.validateEntity(modelRbd, AddGroup.class, DefaultGroup.class);
modelRbd.setContent(modelRbd.getContent().replace(modelRbd.getUrlPref(), URL_REPLACE_STR));
modelRbd.setContent(modelRbd.getContent().replaceAll(TOKEN_REPLACE_REGEX, TOKEN_REPLACE_STR));
+ modelRbdNodeService.saveNodeArr(modelRbd);
modelLineService.insert(modelRbd);
-
return Result.ok();
}
@@ -116,6 +101,7 @@
ValidatorUtils.validateEntity(modelRbd, UpdateGroup.class, DefaultGroup.class);
modelRbd.setContent(modelRbd.getContent().replace(modelRbd.getUrlPref(), URL_REPLACE_STR));
modelRbd.setContent(modelRbd.getContent().replaceAll(TOKEN_REPLACE_REGEX, TOKEN_REPLACE_STR));
+ modelRbdNodeService.saveNodeArr(modelRbd);
modelLineService.update(modelRbd);
return Result.ok();
@@ -136,9 +122,17 @@
@ApiOperation("瑙ｆ瀽")
@LogOperation("瑙ｆ瀽")
public Result analyze(@RequestBody ModelRbd modelRbd) {
- modelLineService.update(modelRbd);
+ update(modelRbd);
boolean result = modelLineService.analyze(modelRbd);
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