From 2fef10f07e65ce6f703c8043085e5728bd311d1e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 17:16:40 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 77253f9..34ec34f 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;
@@ -42,18 +44,23 @@
@Autowired
private ModelLineService modelLineService;
-// @Autowired
-// private PythonLib pythonLib;
+ @Autowired
+ private ModelRbdNodeService modelRbdNodeService;
+
+ @Autowired
+ private PythonLib pythonLib;
/*
@GetMapping("callPythonCalc")
@ApiOperation("淇℃伅")
public Result callPythonCalc() {
- pythonLib.callPython();
+ Result result = pythonLib.callPython();
- return Result.ok();
+ return result;
}
+*/
+/*
@GetMapping("getPythonCalcResult")
@ApiOperation("淇℃伅")
public Result<String> getPythonCalcResult() {
@@ -103,8 +110,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 +123,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,7 +144,7 @@
@ApiOperation("瑙ｆ瀽")
@LogOperation("瑙ｆ瀽")
public Result analyze(@RequestBody ModelRbd modelRbd) {
- modelLineService.update(modelRbd);
+ update(modelRbd);
boolean result = modelLineService.analyze(modelRbd);
return result ? Result.ok() : Result.error("瑙ｆ瀽澶辫触");
}
--
Gitblit v1.9.1