From 481b82866b1714f79dc35ecf2bc26436b027954e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 30 七月 2024 16:08:51 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 107 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 24 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 eafb8b7..0932a48 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
@@ -4,26 +4,23 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.XML;
+import com.fasterxml.jackson.databind.ObjectMapper;
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.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
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.dto.SimulaDataDto;
+import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
+import com.zt.life.modules.mainPart.taskReliability.dto.StatusDto;
import com.zt.life.modules.mainPart.taskReliability.model.CurveParam;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
import com.zt.life.modules.mainPart.taskReliability.model.Task;
import com.zt.life.modules.mainPart.taskReliability.service.SimulatAssessService;
import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import io.swagger.annotations.Api;
-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;
@@ -32,13 +29,15 @@
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.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -53,6 +52,7 @@
public class SimulatAssessController {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessController.class);
private static final String taskTypeProgress = "calcprog";
+ private List<Map<String, Double>> dialgram = new ArrayList<>();
@Autowired
private RedisTemplate redisTemplate;
@@ -70,6 +70,8 @@
private SimulatAssessService simulatAssessService;
private JSONObject xmlJSONObj;
+
+ private JSONObject dialgramJson;
/* @GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -94,8 +96,16 @@
@GetMapping("getSimulatList")
@ApiOperation("淇℃伅")
- public Result<List<SimulatAssess>> getSimulatList(Long productId,Long taskModelId) {
- List<SimulatAssess> data = simulatAssessService.getList(productId,taskModelId);
+ public Result<List<SimulatAssess>> getSimulatList(Long productId, Long taskModelId) {
+ List<SimulatAssess> data = simulatAssessService.getList(productId, taskModelId);
+
+ return Result.ok(data);
+ }
+
+ @GetMapping("getSimulatParams")
+ @ApiOperation("淇℃伅")
+ public Result<SimulatAssess> getSimulatParams(Long id, Long taskModelId) {
+ SimulatAssess data = simulatAssessService.getParams(id, taskModelId);
return Result.ok(data);
}
@@ -103,18 +113,6 @@
@PostMapping("analyze")
public Result<Long> analyze(@RequestBody SimulatAssess simulatAssess) {
//鏁堥獙鏁版嵁
-/*
- ValidatorUtils.validateEntity(simulatAssess, AddGroup.class, DefaultGroup.class);
- Long taskId = UUIDUtil.generateId();
- Integer time = simulatAssess.getSamplPeriod();
- Integer Frequency = simulatAssess.getSimulatFrequency();
- HashMap<String, Object> paramMap = new HashMap<>();
- paramMap.put("taskId", taskId);
- paramMap.put("time", time);
- 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;
@@ -122,9 +120,9 @@
@PostMapping("getResultXML")
public Result<SimulaDataDto> getResultXML(@RequestBody SimulatAssess simulatAssess) {
- if (simulatAssess.getDataType().equals("fz")){
- Integer num = simulatAssessService.getNumById(simulatAssess.getProductId(),simulatAssess.getTaskModelId());
- simulatAssess.setName("浠跨湡璁板綍" + (num+1));
+ if (simulatAssess.getDataType().equals("fz")) {
+ Integer num = simulatAssessService.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
+ simulatAssess.setName("浠跨湡璁板綍" + (num + 1));
simulatAssessService.insert(simulatAssess);
}
String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
@@ -191,6 +189,65 @@
return data;
}
+ @GetMapping("getStatus")
+ public Result<List<ProductStatusDto>> getStatus(Long productId, Long taskId, Long fzId) {
+ String filePath = path + "/" + fzId + "/" + "status.json";
+ ObjectMapper mapper = new ObjectMapper();
+ String jsonStr = null;
+ try {
+ // 浣跨敤 ObjectMapper 鐨� readValue 鏂规硶锛屽皢鏂囦欢涓殑 JSON 鏁版嵁杞崲涓轰竴涓� Java 瀵硅薄
+ // 杩欓噷浣跨敤 Object 绫讳綔涓烘硾鍨嬪弬鏁帮紝琛ㄧず浠绘剰绫诲瀷鐨勫璞�
+ Object obj = mapper.readValue(new File(filePath), Object.class);
+ // 浣跨敤 ObjectMapper 鐨� writeValueAsString 鏂规硶锛屽皢 Java 瀵硅薄杞崲涓� JSON 瀛楃涓�
+ jsonStr = mapper.writeValueAsString(obj);
+
+ } catch (IOException e) {
+ // 澶勭悊寮傚父
+ e.printStackTrace();
+ }
+ dialgramJson = new JSONObject(jsonStr);
+ List<ProductStatusDto> childList = this.getStatusData(productId, taskId);
+ return Result.ok(childList);
+
+ }
+
+ public List<ProductStatusDto> getStatusData(Long productId, Long taskId) {
+ List<ProductStatusDto> childList = simulatAssessService.getChildren(productId, taskId);
+ for (ProductStatusDto item : childList) {
+ if (dialgram.size() > 0) {
+ dialgram.clear();
+ }
+ JSONArray jsonArray = dialgramJson.getJSONArray(String.valueOf(item.getId()));
+ if (jsonArray != null) {
+ this.processJSONArray(jsonArray, item);
+ }
+ }
+ return childList;
+ }
+
+ public void processJSONArray(JSONArray jsonArray, ProductStatusDto productStatusDto) {
+ String status = null;
+ Double times = null;
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object item = jsonArray.get(i);
+ if (item instanceof JSONArray) {
+ processJSONArray((JSONArray) item, productStatusDto); // 閫掑綊璋冪敤
+ } else {
+ if (item instanceof Double) {
+ times = (Double) item;
+ } else {
+ status = String.valueOf(item);
+ }
+ }
+ }
+ if (status != null || times != null) {
+ StatusDto statusDto =new StatusDto();
+ statusDto.setTimes(times);
+ statusDto.setStatus(status);
+ productStatusDto.getStatusList().add(statusDto);
+ }
+ }
+
@GetMapping("getCalcProgress")
public Result getCalcProgress(Long taskId) {
String key = taskId.toString() + taskTypeProgress;
@@ -221,4 +278,6 @@
return Result.ok();
}
+
+
}
--
Gitblit v1.9.1