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 | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 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 ba5f857..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);
}
@@ -567,17 +567,15 @@
ProductStatusDto newRow = null;
if (sameNum > 1) {
newRow = item.clone();
- }
- else
+ } else
newRow = item;
- if ("5".equals(newRow.getProductType())){
+ if ("5".equals(newRow.getProductType())) {
newRow.setDeviceNo(i);
newRow.setDataId(item.getId().toString() + "-" + i);
- if (i>1){
+ if (i > 1) {
newRow.setName(item.getName() + "-" + i);
}
- }
- else{
+ } else {
newRow.setDeviceNo(0);
newRow.setDataId(item.getId().toString());
}
@@ -609,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++) {
@@ -623,6 +621,9 @@
}
}
if (status != null || times != null) {
+ if (StringUtils.isBlank(status)) {
+ status = "M";
+ }
StatusDto statusDto = new StatusDto();
statusDto.setTimes(times);
statusDto.setStatus(status);
@@ -887,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 ->
@@ -1013,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 ->
@@ -1102,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;
@@ -1120,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());
@@ -1223,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;
@@ -1297,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)) {
@@ -1322,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<>();
@@ -1342,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);
@@ -1410,8 +1432,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";
@@ -1469,9 +1490,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);
}
@@ -1609,6 +1632,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