From 18f682f736914e427070b9bb769df538ad9f6d1c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 02 十二月 2024 08:42:38 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 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..2004668 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;
@@ -22,6 +24,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Date;
/**
@@ -37,13 +41,16 @@
private static final String URL_REPLACE_STR = "URL_PREFIX_URL";
private static final String TOKEN_REPLACE_STR = "MY_TOKEN_MY";
+ private static final String TIMESTAMP_REPLACE_STR = "MY_TIMESTAMP_MY";
private static final String TOKEN_REPLACE_REGEX = "token=[0-9a-zA-Z]+&";
+ private static final String TIMESTAMP_REPLACE_REGEX = "&t=[0-9]+";
@Autowired
private ModelLineService modelLineService;
@Autowired
-// private PythonLib pythonLib;
+ private ModelRbdNodeService modelRbdNodeService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -73,27 +80,10 @@
if (data.getContent() != null) {
data.setContent(data.getContent().replace(URL_REPLACE_STR, urlPref));
data.setContent(data.getContent().replace(TOKEN_REPLACE_STR, "token="+token+"&"));
+ data.setContent(data.getContent().replace(TIMESTAMP_REPLACE_STR, "&t="+(new Date()).getTime()));
}
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("鏂板")
@@ -103,8 +93,9 @@
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));
+ modelRbd.setContent(modelRbd.getContent().replaceAll(TIMESTAMP_REPLACE_REGEX, TIMESTAMP_REPLACE_STR));
+ modelRbdNodeService.saveNodeArr(modelRbd);
modelLineService.insert(modelRbd);
-
return Result.ok();
}
@@ -116,6 +107,8 @@
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));
+ modelRbd.setContent(modelRbd.getContent().replaceAll(TIMESTAMP_REPLACE_REGEX, TIMESTAMP_REPLACE_STR));
+ modelRbdNodeService.saveNodeArr(modelRbd);
modelLineService.update(modelRbd);
return Result.ok();
@@ -136,9 +129,18 @@
@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