From d8cb08ce6b68b50d2475b70eb522ea6bbbb17686 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 24 七月 2024 15:26:12 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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 c56ef67..fa81fd7 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,12 +1,15 @@
package com.zt.life.modules.mainPart.taskReliability.controller;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.XML;
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.JsonUtils;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.DefaultGroup;
@@ -18,12 +21,17 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+
+import java.io.IOException;
+import java.io.InputStream;
/**
@@ -37,13 +45,16 @@
@Api(tags = "simulat_assess")
public class SimulatAssessController {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessController.class);
- private static final String taskTypeProgress = "calcreq";
+ private static final String taskTypeProgress = "calcprog";
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private PythonLib pythonLib;
+
+ @Value("${data.reliaSimLib.resultHome}")
+ private String path;
@Autowired
private SimulatAssessService simulatAssessService;
@@ -89,24 +100,28 @@
return result;
}
- @GetMapping("calculate")
- public Result calculate(Long taskId, String List, String code, String errorMsg) {
- SimulatAssess simulatAssess = new SimulatAssess();
- simulatAssess.setId(taskId);
- simulatAssess.setCurveData(List);
- simulatAssess.setCode(code);
- simulatAssess.setErrorMsg(errorMsg);
- simulatAssessService.insert(simulatAssess);
+ @GetMapping("getResultXML")
+ public Result getResultXML(Long taskId) {
+ String filePath = path + "/"+taskId+"/"+"result.xml";
+ InputStream in = JsonUtils.class.getResourceAsStream(filePath);
+ String xml = null;
+ try {
+ xml = IOUtils.toString(in);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ JSONObject xmlJSONObj = XML.toJSONObject(xml);
+
return Result.ok();
}
@GetMapping("getCalcProgress")
- public String getCalcProgress(Long taskId) {
+ public Result getCalcProgress(Long taskId) {
String key = taskId.toString() + taskTypeProgress;
String progress = (String)redisTemplate.opsForValue().get(key);
if (progress==null) progress = "0";
- return progress;
+ return Result.ok(progress);
}
@PutMapping
--
Gitblit v1.9.1