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 | 73 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 16 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 dd90610..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;
@@ -27,32 +29,63 @@
/**
* model_line
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-02-28
*/
@RestController
@RequestMapping("/taskReliability/ModelLine/")
-@Api(tags="model_line")
+@Api(tags = "model_line")
public class ModelLineController {
+
+ private static final String URL_REPLACE_STR = "URL_PREFIX_URL";
+ private static final String TOKEN_REPLACE_STR = "MY_TOKEN_MY";
+ private static final String TOKEN_REPLACE_REGEX = "token=[0-9a-zA-Z]+&";
+
@Autowired
private ModelLineService modelLineService;
+
+ @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("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
})
- public PageResult<ModelLine> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ public PageResult<ModelLine> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(modelLineService.page(queryFilter));
}
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- public Result<ModelLine> get(@PathVariable("id") Long id){
+ public Result<ModelLine> get(@PathVariable("id") Long id) {
ModelLine data = modelLineService.get(id);
return Result.ok(data);
@@ -60,29 +93,37 @@
@GetMapping("getDiagram")
@ApiOperation("淇℃伅")
- public Result<ModelRbd> getDiagram(Long modelId){
+ public Result<ModelRbd> getDiagram(Long modelId, String urlPref, String token) {
ModelRbd data = modelLineService.getDiagram(modelId);
-
+ if (data.getContent() != null) {
+ data.setContent(data.getContent().replace(URL_REPLACE_STR, urlPref));
+ data.setContent(data.getContent().replace(TOKEN_REPLACE_STR, "token="+token+"&"));
+ }
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ModelRbd modelRbd){
+ public Result insert(@RequestBody ModelRbd modelRbd) {
//鏁堥獙鏁版嵁
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();
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ModelRbd modelRbd){
+ public Result update(@RequestBody ModelRbd modelRbd) {
//鏁堥獙鏁版嵁
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();
@@ -91,7 +132,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
modelLineService.delete(ids);
@@ -102,8 +143,8 @@
@PostMapping("analyze")
@ApiOperation("瑙ｆ瀽")
@LogOperation("瑙ｆ瀽")
- public Result analyze(@RequestBody ModelRbd modelRbd){
- modelLineService.update(modelRbd);
+ public Result analyze(@RequestBody ModelRbd modelRbd) {
+ update(modelRbd);
boolean result = modelLineService.analyze(modelRbd);
return result ? Result.ok() : Result.error("瑙ｆ瀽澶辫触");
}
--
Gitblit v1.9.1