From 09ec12487aeafb9856515cecb014a9bb8928f04b Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:39:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 93e99b1..0925f14 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -561,22 +561,28 @@
List<ProductStatusDto> dbList = this.getProduct(productId, taskId);
List<ProductStatusDto> childList = new ArrayList<>();
for (ProductStatusDto item : dbList) {
- if (item.getSameSbNum() > 1) {
- for (int i = 1; i <= item.getSameSbNum(); i++) {
- try {
- ProductStatusDto newRow = item.clone();
+ int sameNum = item.getSameSbNum() == null ? 1 : item.getSameSbNum();
+ for (int i = 1; i <= sameNum; i++) {
+ try {
+ ProductStatusDto newRow = null;
+ if (sameNum > 1) {
+ newRow = item.clone();
+ } else
+ newRow = item;
+ if ("5".equals(newRow.getProductType())) {
newRow.setDeviceNo(i);
- newRow.setName(item.getName() + "-" + i);
newRow.setDataId(item.getId().toString() + "-" + i);
- childList.add(newRow);
- } catch (CloneNotSupportedException e) {
- e.printStackTrace();
+ if (i > 1) {
+ newRow.setName(item.getName() + "-" + i);
+ }
+ } else {
+ newRow.setDeviceNo(0);
+ newRow.setDataId(item.getId().toString());
}
+ childList.add(newRow);
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
}
- } else {
- item.setDeviceNo(0);
- item.setDataId(item.getId().toString());
- childList.add(item);
}
}
childList.sort(Comparator.comparing(ProductStatusDto::getDeviceNo, Comparator.naturalOrder()));
@@ -1086,8 +1092,8 @@
// 璁惧
Integer deviceNo = node.getDeviceNo();
Element nodeTag = parent.addElement("node");
- nodeTag.addAttribute("name", deviceNo == 0 ? dataId.toString() : dataId.toString() + "-" + deviceNo);
- nodeTag.addAttribute("real_name", deviceNo == 0 ? product.getName() : product.getName() + "-" + deviceNo);
+ nodeTag.addAttribute("name", dataId.toString() + "-" + deviceNo);
+ nodeTag.addAttribute("real_name", product.getName() + "-" + deviceNo);
nodeTag.addAttribute("name_path", product.getNamePath());
nodeTag.addAttribute("type", "node");
@@ -1108,7 +1114,7 @@
.filter(item -> taskId.equals(item.getTaskId()))
.filter(item -> taskPhaseModel.getPhaseId().equals(item.getPhaseId()))
.filter(item -> taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()))
- .filter(item -> modelId.equals(item.getModelId()))
+// .filter(item -> modelId.equals(item.getModelId()))
.filter(item -> dataId.equals(item.getProductId()))
.collect(Collectors.toList()).get(0);
}
@@ -1402,8 +1408,7 @@
public SimulaDataDto getResultXML(SimulatAssess simulatAssess) {
if (simulatAssess.getDataType() != null && simulatAssess.getDataType().equals("fz")) {
- Integer num = this.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
- simulatAssess.setName("浠跨湡璁板綍" + (num + 1));
+ simulatAssess.setName(simulatAssess.getName());
this.update(simulatAssess);
}
String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
@@ -1461,7 +1466,11 @@
String[] arr = availability.split(" ");
// 閬嶅巻瀛愬瓧绗︿覆鏁扮粍锛屽皢姣忎釜鍏冪礌杞崲涓篸ouble骞跺瓨鍌ㄥ埌double鏁扮粍涓�
Double j = 0.0;
- for (int a = 0; a < arr.length; a++) {
+ Double b = 100.0;
+ for (int a = 0; a < arr.length - 1; a++) {
+ if (Convert.toDouble(arr[a]) < Convert.toDouble(arr[a+1])) {
+ System.out.println(arr[a]);
+ }
j = samplPeriod + j;
doubleArray.add(Double.parseDouble(arr[a]));
xList.add(j);
@@ -1601,6 +1610,7 @@
SchemeComparCurve curve = new SchemeComparCurve();
curve.setName(task.getTaskName());
+ curve.setSymbol("none");
curve.setSmooth(true);
curve.setType("line");
curve.setData(resultData.getCurveParam().getYData());
--
Gitblit v1.9.1