From 826cd5b51d5106cfea07e397eda184fb15ec7a30 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 14:33:59 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 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 850ecce..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
@@ -16,21 +16,14 @@
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;
import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
/**
@@ -52,7 +45,30 @@
private ModelLineService modelLineService;
@Autowired
-// private PythonLib pythonLib;
+ 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("鍒嗛〉")
@@ -86,24 +102,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("鏂板")
@@ -112,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();
}
@@ -125,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();
@@ -145,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