From 33246bb56e05b273944ec1cc03a58dc112e48848 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 16 八月 2024 09:42:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 130 +++++++------------------------------------
1 files changed, 22 insertions(+), 108 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 475202b..6b5e710 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
@@ -12,9 +12,7 @@
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.dto.*;
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;
@@ -36,10 +34,7 @@
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;
+import java.util.*;
/**
@@ -62,28 +57,10 @@
@Autowired
private TaskService taskService;
- @Value("${data.reliaSimLib.resultHome}")
- private String path;
@Autowired
private SimulatAssessService simulatAssessService;
-
- private JSONObject xmlJSONObj;
-
-
- /* @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),
- })
- public PageResult<SimulatAssess> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
-
- return PageResult.ok(simulatAssessService.page(queryFilter));
- }*/
@GetMapping("{id}")
@ApiOperation("淇℃伅")
@@ -95,8 +72,8 @@
@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 taskModelId) {
+ List<SimulatAssess> data = simulatAssessService.getList(taskModelId);
return Result.ok(data);
}
@@ -105,7 +82,6 @@
@ApiOperation("淇℃伅")
public Result<SimulatAssess> getSimulatParams(Long id, Long taskModelId) {
SimulatAssess data = simulatAssessService.getParams(id, taskModelId);
-
return Result.ok(data);
}
@@ -120,92 +96,14 @@
@PostMapping("getResultXML")
public Result<SimulaDataDto> getResultXML(@RequestBody SimulatAssess simulatAssess) {
- simulatAssessService.deleteSimInfoInRedis(simulatAssess.getId());
- 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";
- String xml = null;
- InputStream in =null;
- try {
- in = new FileInputStream(filePath);
- xml = IOUtils.toString(in);
- } catch (IOException e) {
- e.printStackTrace();
- }finally {
- try {
- in.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- xmlJSONObj = XML.toJSONObject(xml);
- simulatAssess.setShowProductId(simulatAssess.getProductId());
- SimulaDataDto data = this.getResultData(simulatAssess);
+ SimulaDataDto data = simulatAssessService.getResultXML(simulatAssess);
return Result.ok(data);
}
@PostMapping("getResultData")
public Result<SimulaDataDto> getData(@RequestBody SimulatAssess simulatAssess) {
- SimulaDataDto data = this.getResultData(simulatAssess);
+ SimulaDataDto data = simulatAssessService.getResultData(simulatAssess);
return Result.ok(data);
- }
-
- public SimulaDataDto getResultData(SimulatAssess simulatAssess) {
- SimulaDataDto data = new SimulaDataDto();
- CurveParam param = new CurveParam();
- Double samplPeriod = Double.valueOf(simulatAssess.getSamplPeriod());
- Task task = taskService.get(simulatAssess.getTaskModelId());
- samplPeriod = samplPeriod / 60;
- List<Double> xList = new ArrayList<>();
- for (Double i = 0.0; i + samplPeriod <= task.getTaskDuration(); i += samplPeriod) {
- xList.add(i);
- }
- param.setXData(xList);
- JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
- for (int i = 0; i < jsonArray.size(); i++) {
- Long productId = null;
- Object nameValue = jsonArray.getJSONObject(i).get("name");
- if (nameValue instanceof Long) {
- productId = (Long) nameValue;
- if (productId.equals(simulatAssess.getShowProductId())) {
- Object object = jsonArray.getJSONObject(i).get("phase");
- List<Double> doubleArray = new ArrayList<>();
- String availability = null;
- if (object instanceof JSONArray) {
- JSONArray jsonArray2 = jsonArray.getJSONObject(i).getJSONArray("phase");
- for (int j = 0; j < jsonArray2.size(); j++) {
- if (availability != null) {
- availability = availability + " " + jsonArray2.getJSONObject(j).get("availability");
- } else {
- availability = (String) jsonArray2.getJSONObject(j).get("availability");
- }
- }
- } else {
- JSONObject jsonObject2 = jsonArray.getJSONObject(i).getJSONObject("phase");
- availability = (String) jsonObject2.get("availability");
- }
-
- String[] arr = availability.split(" ");
- // 閬嶅巻瀛愬瓧绗︿覆鏁扮粍锛屽皢姣忎釜鍏冪礌杞崲涓篸ouble骞跺瓨鍌ㄥ埌double鏁扮粍涓�
- for (int a = 0; a < arr.length; a++) {
- doubleArray.add(Double.parseDouble(arr[a]));
- }
- param.setYData(doubleArray);
- Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
- Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
- Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
- data.setMtbf(mtbf);
- data.setMttr(mttr);
- data.setMsr(msr);
- }
- data.setCurveParam(param);
- }
- }
-
- return data;
}
@GetMapping("getStatus")
@@ -243,9 +141,25 @@
String key = taskId.toString() + simulatAssessService.RELIA_SIM_TASK_TYPE_PROGRESS;
String progress = (String) redisTemplate.opsForValue().get(key);
if (progress == null) progress = "0";
+ if (Objects.equals(progress, "100")) {
+ simulatAssessService.deleteSimInfoInRedis(taskId);
+ }
return Result.ok(progress);
}
+ @GetMapping("ReliabilityWeakness")
+ public Result<List<WeakDto>> getReliabilityWeakness(Long fzId, Long taskId, Long productId) {
+ List<WeakDto> data = simulatAssessService.getReliabilityWeakness(fzId, taskId, productId);
+ return Result.ok(data);
+ }
+
+ @GetMapping("SchemeCompar")
+ public Result<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList,Long showProductId) {
+ SchemeComparDto data = simulatAssessService.SchemeCompar(taskList,showProductId);
+ return Result.ok(data);
+ }
+
+
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
--
Gitblit v1.9.1