From 0c39f5388d95dbc41c47285a8c2dfda57a019d5b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 08 一月 2025 08:47:49 +0800
Subject: [PATCH] 修改：“可修设备可靠度为1”通过给算法包传递参数固定为1、type为fixed的failure_model来实现。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 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 7ab70ec..a69a11e 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);
}
@@ -607,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++) {
@@ -621,6 +621,9 @@
}
}
if (status != null || times != null) {
+ if (StringUtils.isBlank(status)) {
+ status = "M";
+ }
StatusDto statusDto = new StatusDto();
statusDto.setTimes(times);
statusDto.setStatus(status);
@@ -1121,7 +1124,13 @@
.filter(item -> dataId.equals(item.getProductId()))
.collect(Collectors.toList()).get(0);
}
- FailureModel failureModel = createFailureModel(paramData, taskBinoParam);
+ FailureModel failureModel = null;
+ if (1 == paramData.getRepairable() &&
+ isRepairDirac(simulatAssess.getRepairDiracFlag(), taskPhaseModel, product.getId())) {
+ failureModel = createFailureModelDirac();
+ } else {
+ failureModel = createFailureModel(paramData, taskBinoParam);
+ }
failureModels.add(failureModel);
Element failureTag = nodeTag.addElement("failure_model");
failureTag.addAttribute("name", failureModel.getId().toString());
@@ -1224,6 +1233,15 @@
return failureModel;
}
+ private FailureModel createFailureModelDirac() {
+ FailureModel failureModel = new FailureModel();
+ failureModel.setId(UUIDUtil.generateId());
+ failureModel.setType(FailureModel.TYPE_FIX);
+ failureModel.setParam1(1);
+
+ return failureModel;
+ }
+
private boolean isRepairDirac(Boolean repairDiracFlag, TaskPhaseModel taskPhaseModel, Long productId) {
boolean result = false;
@@ -1298,7 +1316,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)) {
@@ -1323,12 +1340,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<>();
@@ -1343,13 +1362,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);
@@ -1469,13 +1490,11 @@
String[] arr = availability.split(" ");
// 閬嶅巻瀛愬瓧绗︿覆鏁扮粍锛屽皢姣忎釜鍏冪礌杞崲涓篸ouble骞跺瓨鍌ㄥ埌double鏁扮粍涓�
Double j = 0.0;
- 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]));
+ if (!StringUtils.isEmpty(arr[a])) {
+ doubleArray.add(Double.parseDouble(arr[a]));
+ }
xList.add(j);
}
--
Gitblit v1.9.1