From 413eae5cb4d5fe78fc25258bf7b5e3b53740b1f9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 24 七月 2024 11:08:01 +0800
Subject: [PATCH] 1）新增仿真时模型及参数完整性检查 2）增加调用算法库后端接口
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
index 88d71d9..c56ef67 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -1,32 +1,29 @@
package com.zt.life.modules.mainPart.taskReliability.controller;
-import cn.hutool.http.HttpUtil;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
-import com.zt.common.utils.UUIDUtil;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
-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.SimulatAssess;
import com.zt.life.modules.mainPart.taskReliability.service.SimulatAssessService;
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.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
/**
@@ -39,6 +36,15 @@
@RequestMapping("/taskReliability/SimulatAssess/")
@Api(tags = "simulat_assess")
public class SimulatAssessController {
+ private static final Logger logger = LoggerFactory.getLogger(SimulatAssessController.class);
+ private static final String taskTypeProgress = "calcreq";
+
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Autowired
+ private PythonLib pythonLib;
+
@Autowired
private SimulatAssessService simulatAssessService;
@@ -66,6 +72,7 @@
@PostMapping("analyze")
public Result<Long> analyze(@RequestBody SimulatAssess simulatAssess) {
//鏁堥獙鏁版嵁
+/*
ValidatorUtils.validateEntity(simulatAssess, AddGroup.class, DefaultGroup.class);
Long taskId = UUIDUtil.generateId();
Integer time = simulatAssess.getSamplPeriod();
@@ -76,8 +83,10 @@
paramMap.put("Frequency", Frequency);
paramMap.put("url", "http://localhost:8050/test-project//taskReliability/SimulatAssess/calculate");
String result1 = HttpUtil.get("http://localhost:8080/system/user/get", paramMap);
+*/
+ Result result = pythonLib.callPython(simulatAssess);
- return Result.ok(taskId);
+ return result;
}
@GetMapping("calculate")
@@ -92,6 +101,14 @@
return Result.ok();
}
+ @GetMapping("getCalcProgress")
+ public String getCalcProgress(Long taskId) {
+ String key = taskId.toString() + taskTypeProgress;
+ String progress = (String)redisTemplate.opsForValue().get(key);
+ if (progress==null) progress = "0";
+ return progress;
+ }
+
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
--
Gitblit v1.9.1