From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 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 989600b..a38a8d1 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
@@ -257,7 +257,7 @@
JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), dto.getName());
JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), 20);
- JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y - 15);
+ JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y + 10);
jsonArray3.add(textJson);
}
@@ -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()));
@@ -601,7 +607,7 @@
if (jsonArray3.size() == 0) {
StatusDto statusDto = new StatusDto();
statusDto.setTimes(phaseModelList.get(j).getGkDuration());
- statusDto.setStatus("");
+ statusDto.setStatus("M");
productStatusDto.getStatusList().add(statusDto);
} else {
for (int a = 0; a < jsonArray3.size(); a++) {
@@ -615,6 +621,9 @@
}
}
if (status != null || times != null) {
+ if (StringUtils.isBlank(status)) {
+ status = "M";
+ }
StatusDto statusDto = new StatusDto();
statusDto.setTimes(times);
statusDto.setStatus(status);
@@ -879,7 +888,8 @@
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element taskTag = tasksTag.addElement("task");
taskTag.addAttribute("duration", String.valueOf(taskPhaseModel.getOperatConditDuration()));
- taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
+// taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
+ taskTag.addAttribute("model", taskPhaseModel.getId().toString());
if (null != taskPhaseModel.getPhaseConstraints() && taskPhaseModel.getPhaseConstraints().size() > 0) {
taskTag.addAttribute("NAM",
taskPhaseModel.getPhaseConstraints().stream().map(item ->
@@ -1005,7 +1015,8 @@
Element modelsTag = root.addElement("models");
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element modelTag = modelsTag.addElement("model");
- modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
+// modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
+ modelTag.addAttribute("name", taskPhaseModel.getId().toString());
List<OperatConditModel> gkModelsAssembled = operatConditModelDao.getGKModelAssembled(
taskPhaseModel.getOperatConditId());
OperatConditModel gkModelTop = gkModelsAssembled.stream().filter(item ->
@@ -1094,7 +1105,8 @@
ParamData paramData = paramDataList.stream().filter(item ->
dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
Double ratio = paramData.getTaskMtbcfOperatingRatio();
- if (null != ratio && ratio > 0) {
+// if (null != ratio && ratio > 0) {
+ if (null != ratio && ratio != 1.0) {
// 闂存柇鍨嬭澶囩殑澶勭悊
double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
@@ -1108,7 +1120,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);
}
@@ -1289,7 +1301,6 @@
JSONObject xmlJSONObj = XML.toJSONObject(xml);
JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
for (int i = 0; i < jsonArray.size(); i++) {
- WeakDto data = new WeakDto();
Long productId1;
String nameValue = jsonArray.getJSONObject(i).get("name").toString();
if (StringUtils.isNotBlank(nameValue)) {
@@ -1314,12 +1325,14 @@
}
List<WeakDto> productList = baseDao.getProductList(taskId, productId);
for (WeakDto item : productList) {
- WeakDto dto = map.get(item.getId());
- item.setMtbf(dto.getMtbf());
- item.setMttr(dto.getMttr());
- item.setMsr(dto.getMsr());
- item.setMtbfTime(dto.getMtbf() / item.getTimeRate());
- item.setIsWeak(0);
+ if (map.get(item.getId()) != null) {
+ WeakDto dto = map.get(item.getId());
+ item.setMtbf(dto.getMtbf());
+ item.setMttr(dto.getMttr());
+ item.setMsr(dto.getMsr());
+ item.setMtbfTime(dto.getMtbf() / item.getTimeRate());
+ item.setIsWeak(0);
+ }
}
List<WeakDto> treeList = new ArrayList<>();
@@ -1334,13 +1347,15 @@
private void getIsweak(List<WeakDto> treeList) {
WeakDto minDto = null;
for (WeakDto dto : treeList) {
- if (dto.getProductType() == 10)
- continue;
- if (minDto == null) {
- minDto = dto;
- }
- if (dto.getMtbfTime() < minDto.getMtbfTime()) {
- minDto = dto;
+ if (dto.getMtbfTime() != null) {
+ if (dto.getProductType() == 10)
+ continue;
+ if (minDto == null) {
+ minDto = dto;
+ }
+ if (dto.getMtbfTime() < minDto.getMtbfTime()) {
+ minDto = dto;
+ }
}
}
minDto.setIsWeak(1);
@@ -1402,8 +1417,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,9 +1475,11 @@
String[] arr = availability.split(" ");
// 閬嶅巻瀛愬瓧绗︿覆鏁扮粍锛屽皢姣忎釜鍏冪礌杞崲涓篸ouble骞跺瓨鍌ㄥ埌double鏁扮粍涓�
Double j = 0.0;
- for (int a = 0; a < arr.length; a++) {
+ for (int a = 0; a < arr.length - 1; a++) {
j = samplPeriod + j;
- doubleArray.add(Double.parseDouble(arr[a]));
+ if (!StringUtils.isEmpty(arr[a])) {
+ doubleArray.add(Double.parseDouble(arr[a]));
+ }
xList.add(j);
}
@@ -1601,6 +1617,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