From 7c723bef7e4d9aaf1ac07da4a369b28f572e551c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 28 五月 2024 11:58:48 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 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..f305c0a 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
@@ -20,17 +20,9 @@
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 +44,23 @@
private ModelLineService modelLineService;
@Autowired
-// private PythonLib pythonLib;
+ 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("鍒嗛〉")
@@ -85,24 +93,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("鏂板")
--
Gitblit v1.9.1