From 1cbc5439e1a250427587b4b31473a0b4448b68ff Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:04:52 +0800
Subject: [PATCH] 可靠性仿真评估时后端增加可修设备可修阶段可靠度固定为1的控制
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 491 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 412 insertions(+), 79 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 3f8a66d..b32a5ea 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
@@ -24,6 +24,7 @@
import com.zt.life.modules.mainPart.taskReliability.dto.TaskPhaseConstraintDto;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import com.zt.life.modules.mainPart.utils.GetStringSpace;
+import io.swagger.models.auth.In;
import org.apache.commons.io.IOUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
@@ -43,7 +44,10 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.*;
+import java.nio.file.FileAlreadyExistsException;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -107,6 +111,7 @@
String templetStr = "{\"cells\":[]}";
Map<String, JSONObject> templetsMap = new HashMap<>();
Map<String, String> templetsStrMap = new HashMap<>();
+ Map<Integer, String> templetsStrMap2 = new HashMap<>();
private JSONObject xmlJSONObj;
@@ -150,7 +155,10 @@
return baseDao.getChildren(productId, taskId);
}
- public String getTimeDiagram(Long productId, Long taskId, Long fzId) {
+ public TimeDiagramDto getTimeDiagram(Long productId, Long taskId, Long fzId, double smallWidth, double minPointNum) {
+ TimeDiagramDto timeDiagramDto = new TimeDiagramDto();
+ timeDiagramDto.setSmallWidth(smallWidth);
+ timeDiagramDto.setMinPointNum(minPointNum);
String filePath = path + "/" + fzId + "/" + "status.json";
ObjectMapper mapper = new ObjectMapper();
String jsonStr = null;
@@ -178,7 +186,10 @@
JSONObject jsonObject = new JSONObject(templetStr);
JSONArray jsonArray = jsonObject.getJSONArray("cells");
- this.getPetsInfo();
+ JSONObject jsonObject3 = new JSONObject(templetStr);
+ JSONArray jsonArray3 = jsonObject3.getJSONArray("cells");
+
+ String modelStr2 = this.getPetsInfo();
double x1 = 0;
double x2 = 0;
int y = -10;
@@ -189,26 +200,43 @@
double pointNumPerHour = 60.0 / simulatAssess.getSamplPeriod();
//鏃跺簭鍥剧嚎
+ List<TimeDiagramStatusDto> statusDtoList = new ArrayList<>();
+ List<TimeDiagramStatusDto> statusDtoListOld = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
x1 = 0;
groupY = groupHeight * i;
ProductStatusDto dto = list.get(i);
double startTime = 0.0;
+ int status2 = 5;
for (StatusDto status : dto.getStatusList()) {
switch (status.getStatus()) {
case "O":
y = groupY;
+ status2 = 5;
break;
case "F":
y = groupY;// + spaceHeight;
+ status2 = 1;
break;
case "I":
+ y = groupY;// + spaceHeight;
+ status2 = 3;
+ break;
case "S":
+ y = groupY;// + spaceHeight;
+ status2 = 2;
+ break;
case "M":
y = groupY;// + 2 * spaceHeight;
+ status2 = 4;
break;
}
x2 = x1 + status.getTimes() * pointNumPerHour + 5;
+ if (i == 0) {
+ statusDtoList.add(new TimeDiagramStatusDto(x1, x2, status2));
+ } else {
+ statusDtoListOld.add(new TimeDiagramStatusDto(x1, x2, status2));
+ }
JSONObject lineJson = new JSONObject(templetsStrMap.get(status.getStatus()));
setlineXy(lineJson, x1, y, x2, y, "");
JsonUtils2.setJsonValueByPath(lineJson, "data/status".split("/"), status.getStatus());
@@ -224,29 +252,15 @@
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);
- jsonArray.add(textJson);
- }
-
- //鍥句緥
- int spaceWitdth = 80;
- x1 = -spaceWitdth;
- x2 = -11;
- y = -110;
- String[] tlArr = "O,F,I,S,M".split(",");
- for (String s : tlArr) {
- JSONObject f = templetsMap.get(s);
- x1 = x1 + spaceWitdth;
- x2 = x2 + spaceWitdth;
- setlineXy(f, x1, y, x2, y, null);
- jsonArray.add(f);
+ jsonArray3.add(textJson);
}
//闃舵妯″瀷鍙婂埢搴�
x1 = 0;
x2 = 0;
- double y1 = -80;
- y = -60;
- double y2 = -50;
+ double y1 = -60;
+ y = -40;
+ double y2 = -30;
JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
setlineXy(modelJson, 1, y1, 1, y2, null);
@@ -288,6 +302,7 @@
jsonArray.add(textJson);
x1 = x2;
}
+
JSONObject modelJson3 = new JSONObject(templetsStrMap.get("model"));
setlineXy(modelJson3, 0, y, x2, y, null);
jsonArray.add(modelJson3);
@@ -315,9 +330,128 @@
curPointHour += periodHour;
}
+ List<TimeDiagramStatusDto> statusDtoListNew = new ArrayList<>();
+ while (statusDtoListOld.size() > 0) {
+ statusDtoListOld.stream().sorted(Comparator.comparing(TimeDiagramStatusDto::getX1)).collect(Collectors.toList());
+ TimeDiagramStatusDto nextStatusDto = statusDtoListOld.get(0);
+ if (statusDtoListNew.size() == 0) {
+ statusDtoListNew.add(nextStatusDto);
+ } else {
+ TimeDiagramStatusDto currentStatusDto = statusDtoListNew.get(statusDtoListNew.size() - 1);
+ if (nextStatusDto.getStatus() < currentStatusDto.getStatus()) {
+ if (nextStatusDto.getX1() == currentStatusDto.getX1() && nextStatusDto.getX2() == currentStatusDto.getX2()) {
+ currentStatusDto.setStatus(nextStatusDto.getStatus());
+ } else if (nextStatusDto.getX1() == currentStatusDto.getX1() && nextStatusDto.getX2() < currentStatusDto.getX2()) {
+ statusDtoListOld.add(new TimeDiagramStatusDto(nextStatusDto.getX2(), currentStatusDto.getX2(), currentStatusDto.getStatus()));
+ currentStatusDto.setStatus(nextStatusDto.getStatus());
+ currentStatusDto.setX2(nextStatusDto.getX2());
+ } else if (nextStatusDto.getX1() == currentStatusDto.getX1() && nextStatusDto.getX2() > currentStatusDto.getX2()) {
+ currentStatusDto.setStatus(nextStatusDto.getStatus());
+ currentStatusDto.setX2(nextStatusDto.getX2());
+ } else if (nextStatusDto.getX1() > currentStatusDto.getX1() && nextStatusDto.getX2() >= currentStatusDto.getX2()) {
+ currentStatusDto.setX2(nextStatusDto.getX1());
+ statusDtoListNew.add(new TimeDiagramStatusDto(nextStatusDto.getX1(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
+ } else if (nextStatusDto.getX1() > currentStatusDto.getX1() && nextStatusDto.getX2() < currentStatusDto.getX2()) {
+ currentStatusDto.setX2(nextStatusDto.getX1());
+ statusDtoListNew.add(new TimeDiagramStatusDto(nextStatusDto.getX1(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
+ statusDtoListOld.add(new TimeDiagramStatusDto(nextStatusDto.getX2(), currentStatusDto.getX2(), currentStatusDto.getStatus()));
+ }
+ } else {
+ if (nextStatusDto.getX2() > currentStatusDto.getX2()) {
+ statusDtoListOld.add(new TimeDiagramStatusDto(currentStatusDto.getX2(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
+ }
+ }
+ }
+ statusDtoListOld.remove(0);
+ }
+ timeDiagramDto.setTotalWidth(x2);
+ double pointRate = timeDiagramDto.getTotalWidth() / timeDiagramDto.getSmallWidth();
- return jsonObject.toString();
+ List<List<TimeDiagramStatusDto>> lineArray = new ArrayList();
+ lineArray.add(statusDtoList);
+ lineArray.add(statusDtoListNew);
+
+ List<List<TimeDiagramStatusDto>> smallStatusDtoList = new ArrayList<>();
+ for (int j = 0; j < lineArray.size(); j++) {
+ List<TimeDiagramStatusDto> tmpStatusDtoList = new ArrayList<>();
+ int lastStatus = 5;
+ Boolean isFirst = true;
+ x1 = 0;
+ for (double i = 0; i < timeDiagramDto.getSmallWidth(); i = i + timeDiagramDto.getMinPointNum()) {
+ int netStatus = getPointStatus(lineArray.get(j), i * pointRate, (i + timeDiagramDto.getMinPointNum()) * pointRate - 1);
+ if (!isFirst) {
+ if (lastStatus != netStatus) {
+ tmpStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
+ lastStatus = netStatus;
+ x1 = i;
+ }
+ } else {
+ lastStatus = netStatus;
+ isFirst = false;
+ }
+ x2 = i + timeDiagramDto.getMinPointNum() - 1;
+ }
+ tmpStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
+ smallStatusDtoList.add(tmpStatusDtoList);
+ }
+
+ JSONObject jsonObject2 = new JSONObject(modelStr2);
+ JSONArray jsonArray2 = jsonObject2.getJSONArray("cells");
+ y = 10;
+ for (int i = 0; i < smallStatusDtoList.size(); i++) {
+ for (TimeDiagramStatusDto status : smallStatusDtoList.get(i)) {
+ JSONObject lineJson = new JSONObject(templetsStrMap2.get(status.getStatus()));
+ setlineXy(lineJson, status.getX1(), y, status.getX2() + 5, y, "");
+ JsonUtils2.setJsonValueByPath(lineJson, "data/status".split("/"), status.getStatus());
+ JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
+ jsonArray2.add(lineJson);
+ }
+ y = y + 25;
+ }
+
+ //鍥句緥
+ int spaceWitdth = 80;
+ x1 = 0;
+ x2 = spaceWitdth - 11;
+ y = 60;
+ String[] tlArr = "O,F,I,S,M".split(",");
+ for (String s : tlArr) {
+ JSONObject f = templetsMap.get(s);
+ x1 = x1 + spaceWitdth;
+ x2 = x2 + spaceWitdth;
+ setlineXy(f, x1, y, x2, y, null);
+ jsonArray2.add(f);
+ }
+ timeDiagramDto.setDiagramJson(jsonObject.toString());
+ timeDiagramDto.setSmallDiagramJson(jsonObject2.toString());
+ timeDiagramDto.setTextDiagramJson(jsonObject3.toString());
+
+ return timeDiagramDto;
}
+
+ private int getPointStatus(List<TimeDiagramStatusDto> dtoList, double x1, double x2) {
+ int status = 5;
+ boolean findStart = false;
+ for (int i = 0; i < dtoList.size(); i++) {
+ if (x2 <= dtoList.get(i).getX1()) {
+ break;
+ }
+
+ if (!findStart) {
+ if (dtoList.get(i).getX1() >= x1 && x1 <= dtoList.get(i).getX2()) {
+ status = dtoList.get(i).getStatus();
+ findStart = true;
+ }
+ }
+
+ if (dtoList.get(i).getX2() >= x2) {
+ if (dtoList.get(i).getStatus() < status)
+ status = dtoList.get(i).getStatus();
+ }
+ }
+ return status;
+ }
+
public void setlineXy(JSONObject lineJson, double x1, double y1, double x2, double y2, String text) {
JsonUtils2.setJsonValueByPath(lineJson, "source/x".split("/"), x1);
@@ -330,12 +464,14 @@
}
}
- public void getPetsInfo() {
+ public String getPetsInfo() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("projectId", 10000);
params.put("diagramId", 10000);
+ String modelStr2 = "";
List<TimeDiagram> list_style = baseDao.getTimeDiagram(params);
if (list_style.size() > 0) {
+ modelStr2 = list_style.get(0).getContent2();
String modelStr = list_style.get(0).getContent();
JSONObject modelJson = new JSONObject(modelStr);
JSONArray modelJsonArray = modelJson.getJSONArray("cells");
@@ -349,22 +485,27 @@
if ("杩愯".equals(nodeMarker)) {
templetsMap.put("O", jsonObject);
templetsStrMap.put("O", jsonObject.toString());
+ templetsStrMap2.put(5, jsonObject.toString());
}
if ("鏁呴殰".equals(nodeMarker)) {
templetsMap.put("F", jsonObject);
templetsStrMap.put("F", jsonObject.toString());
+ templetsStrMap2.put(1, jsonObject.toString());
}
if ("绌洪棽".equals(nodeMarker)) {
templetsMap.put("I", jsonObject);
templetsStrMap.put("I", jsonObject.toString());
+ templetsStrMap2.put(3, jsonObject.toString());
}
if ("澶囦唤".equals(nodeMarker)) {
templetsMap.put("S", jsonObject);
templetsStrMap.put("S", jsonObject.toString());
+ templetsStrMap2.put(2, jsonObject.toString());
}
if ("鏈敤".equals(nodeMarker)) {
templetsMap.put("M", jsonObject);
templetsStrMap.put("M", jsonObject.toString());
+ templetsStrMap2.put(4, jsonObject.toString());
}
if ("妯″瀷".equals(nodeMarker)) {
JsonUtils2.setJsonValueByPath(tmpJSONObject, "attrs/text/text".split("/"), "");
@@ -403,6 +544,7 @@
}
}
}
+ return modelStr2;
}
public List<ProductStatusDto> getStatusData(Long productId, Long taskId) {
@@ -476,16 +618,20 @@
}
@Transactional(rollbackFor = Exception.class)
- public Result simulate(SimulatAssess simulatAssess) {
- Result result = null;
+ public List<TaskModelCheckResultDto> simulateChecK(SimulatAssess simulatAssess) {
+ List<TaskModelCheckResultDto> result = null;
// 1. 妫�鏌ユā鍨嬪畬鏁存��
List<TaskModelCheckResultDto> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
simulatAssess.getTaskModelId());
if (chkResult.size() > 0) {
- result = Result.error("妯″瀷涓嶅畬鏁达紝璇锋鏌ユā鍨嬪畾涔夊強鍙傛暟閰嶇疆銆�");
- return result;
+ return chkResult;
}
+ return result;
+ }
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean simulate(SimulatAssess simulatAssess) {
+ Boolean result = false;
// 2. 缁勮渚涚畻娉曞簱浠跨湡鐨勬ā鍨媥ml
assembleModelXml(simulatAssess);
@@ -495,12 +641,16 @@
return result;
}
- private Result callReliaSimLib(SimulatAssess simulatAssess) {
- Result result = null;
+ private Boolean callReliaSimLib(SimulatAssess simulatAssess) {
+ Boolean result = false;
InputStream is = null;
BufferedReader br = null;
try {
- setParamToRedis(simulatAssess);
+ try {
+ setParamToRedis(simulatAssess);
+ } catch (Exception e) {
+ throw new RenException("璁块棶Redis澶辫触銆傝妫�鏌edis鏄惁宸插惎鍔ㄣ��");
+ }
Process process = null;
String command = "python " + reliaSimMain;
@@ -512,7 +662,7 @@
} else if (System.getProperty("os.name").toLowerCase().indexOf("linux") > -1) {
process = Runtime.getRuntime().exec(new String[]{"/bin/sh", "-c", command});
} else {
- throw new Exception("鏆備笉鏀寔璇ユ搷浣滅郴缁燂紝杩涜鍚姩绠楁硶搴撹绠楋紒");
+ throw new RenException("鏆備笉鏀寔璇ユ搷浣滅郴缁燂紝杩涜鍚姩绠楁硶搴撹绠楋紒");
}
is = process.getInputStream();
// 浠ュ懡浠よ鏂瑰紡璋冪敤绠楁硶搴撴椂锛屾帴鍙ｇ害瀹氳繑鍥炵殑缁撴灉鏄痷tf-8缂栫爜
@@ -523,17 +673,17 @@
if (line != null) {
ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
if ("0".equals(rtn.getCode())) {
- logger.info("鍚姩绠楁硶搴撴垚鍔熴��");
- result = Result.ok();
+ logger.info("鍚姩鍙潬鎬т豢鐪熻瘎浼扮畻娉曞簱鎴愬姛銆�");
+ result = true;
} else {
String errorMsg = rtn.getErrorMsg();
- throw new RuntimeException("鍚姩绠楁硶搴撳け璐�: errorMsg=" + errorMsg);
+ throw new RenException("鍚姩鍙潬鎬т豢鐪熻瘎浼扮畻娉曞簱澶辫触: errorMsg=" + errorMsg);
}
}
- } catch (Exception e) {
- logger.error("鍚姩绠楁硶搴撲豢鐪熸椂鍙戠敓Exception锛�", e);
+ } catch (IOException e) {
+ logger.error("鍚姩鍙潬鎬т豢鐪熻瘎浼扮畻娉曞簱浠跨湡鏃跺彂鐢烢xception锛�", e);
e.printStackTrace();
- result = Result.error(e.getMessage());
+ throw new RenException("鍚姩鍙潬鎬т豢鐪熻瘎浼扮畻娉曞簱澶辫触: errorMsg=" + e.getMessage());
} finally {
if (is != null) {
try {
@@ -586,6 +736,9 @@
List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
Long taskId = simulatAssess.getTaskModelId();
Task task = taskService.get(taskId);
+ if (simulatAssess.getTaskDuration() != null) {
+ task.setTaskDuration(simulatAssess.getTaskDuration());
+ }
List<TaskBinoParam> binoParams = taskBinoParamDao.getBinoParams(taskId);
// 1. 璁＄畻鍚勪换鍔￠樁娈电殑杩愯鏃堕暱
@@ -605,7 +758,8 @@
Element root = document.addElement("des");
root.addAttribute("name", "General system");
addTasksTag(taskPhaseModelAll, root);
- addModelsTag(taskId,
+ addModelsTag(simulatAssess,
+ taskId,
productId,
product.getName(),
product.getNamePath(),
@@ -638,7 +792,7 @@
insert(simulatAssess);
} catch (Exception e) {
e.printStackTrace();
- throw new RuntimeException("缁勮绠楁硶搴撲豢鐪熻绠楃敤妯″瀷XML澶辫触: " + e.getMessage());
+ throw new RenException("缁勮绠楁硶搴撲豢鐪熻绠楃敤妯″瀷XML澶辫触: " + e.getMessage());
}
}
@@ -742,6 +896,10 @@
ele = repairModelTag.addElement("shape");
ele.addAttribute("value", String.valueOf(repairModel.getParam3()));
break;
+ case RepairModel.TYPE_DIRAC:
+ ele = repairModelTag.addElement("repair-time");
+ ele.addAttribute("value", String.valueOf(repairModel.getParam1()));
+ break;
default:
break;
}
@@ -784,7 +942,8 @@
return taskPhases;
}
- private void addModelsTag(Long taskId,
+ private void addModelsTag(SimulatAssess simulatAssess,
+ Long taskId,
Long productId,
String productName,
String productNamePath,
@@ -810,7 +969,8 @@
"end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
ModelNode computerNode = modelNodeAndVnodeList.stream().filter(item ->
endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(taskId,
+ node2DOM(simulatAssess,
+ taskId,
taskPhaseModel,
gkModelTop.getModelId(),
productId,
@@ -828,7 +988,8 @@
}
// 閫掑綊鍑芥暟
- private void node2DOM(Long taskId,
+ private void node2DOM(SimulatAssess simulatAssess,
+ Long taskId,
TaskPhaseModel taskPhaseModel,
Long modelId,
Long productId,
@@ -858,7 +1019,8 @@
"end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
ModelNode computerNode = modelNodeAndVnodeListSub.stream().filter(item ->
endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(taskId,
+ node2DOM(simulatAssess,
+ taskId,
taskPhaseModel,
gkModel.getModelId(),
product.getId(),
@@ -874,9 +1036,10 @@
failureModels, repairModels);
} else if ("5".equals(product.getProductType())) {
// 璁惧
+ Integer deviceNo = node.getDeviceNo();
Element nodeTag = parent.addElement("node");
- nodeTag.addAttribute("name", dataId.toString());
- nodeTag.addAttribute("real_name", product.getName());
+ nodeTag.addAttribute("name", deviceNo == 0 ? dataId.toString() : dataId.toString()+"-"+deviceNo);
+ nodeTag.addAttribute("real_name", deviceNo == 0 ? product.getName() : product.getName()+"-"+deviceNo);
nodeTag.addAttribute("name_path", product.getNamePath());
nodeTag.addAttribute("type", "node");
@@ -908,7 +1071,12 @@
if (1 == paramData.getRepairable()) {
// 鍙淮淇�
- RepairModel repairModel = createRepairModel(paramData);
+ RepairModel repairModel = null;
+ if (isRepairDirac(simulatAssess.getRepairDiracFlag(), taskPhaseModel, product.getId())) {
+ repairModel = createRepairModelDirac(0);
+ } else {
+ repairModel = createRepairModel(paramData);
+ }
repairModels.add(repairModel);
Element repairTag = nodeTag.addElement("repair_model");
repairTag.addAttribute("name", repairModel.getId().toString());
@@ -935,6 +1103,7 @@
element.addAttribute("k", algo.getVoteNum().toString());
} else if ("switch".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "standby");
+ element.addAttribute("k", algo.getVoteNum().toString());
} else if ("bridge".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "bridge");
}
@@ -942,7 +1111,8 @@
for (String nodeStr : computerNodeListStr) {
ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(taskId,
+ node2DOM(simulatAssess,
+ taskId,
taskPhaseModel,
modelId,
null,
@@ -977,7 +1147,8 @@
break;
case 3:
// 浜岄」鍒嗗竷
- if (taskBinoParam.getSimulatTimes().intValue() == taskBinoParam.getSuccessTimes().intValue()) {
+ if ((taskBinoParam.getSimulatTimes() == null && taskBinoParam.getSuccessTimes() == null) ||
+ (taskBinoParam.getSimulatTimes().intValue() == taskBinoParam.getSuccessTimes().intValue())) {
// 鐩哥瓑鍒欎负鎴愯触鍨�
failureModel.setType(FailureModel.TYPE_FIX);
failureModel.setParam1(taskBinoParam.getSuccessRate());
@@ -996,23 +1167,43 @@
return failureModel;
}
+ private boolean isRepairDirac(boolean repairDiracFlag, TaskPhaseModel taskPhaseModel, Long productId) {
+ boolean result = false;
+
+ if (repairDiracFlag) {
+ if (taskPhaseModel.getPhaseConstraints() != null) {
+ List<TaskPhaseConstraintDto> list = taskPhaseModel.getPhaseConstraints().stream().filter(item ->
+ productId.equals(item.getProductId())).collect(Collectors.toList());
+ if (list.size() == 0) {
+ result = true;
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private RepairModel createRepairModelDirac(double time) {
+ RepairModel repairModel = new RepairModel();
+ repairModel.setId(UUIDUtil.generateId());
+ repairModel.setParam1(0);
+ return repairModel;
+ }
+
private RepairModel createRepairModel(ParamData paramData) {
RepairModel repairModel = new RepairModel();
repairModel.setId(UUIDUtil.generateId());
switch (paramData.getRepairDistribType()) {
case 1:
// 鎸囨暟鍒嗗竷
- repairModel.setType(FailureModel.TYPE_EXP);
+ repairModel.setType(RepairModel.TYPE_EXP);
repairModel.setParam1(1.0 / paramData.getRepairMttcr());
break;
case 2:
// 濞佸竷灏斿垎甯�
- repairModel.setType(FailureModel.TYPE_WBL);
+ repairModel.setType(RepairModel.TYPE_WBL);
repairModel.setParam2(paramData.getRepairMttcrOtherParams2());
repairModel.setParam3(paramData.getRepairMttcrOtherParams3());
- break;
- case 3:
- // 浜岄」鍒嗗竷锛堢淮淇病鏈夛級
break;
default:
break;
@@ -1112,43 +1303,55 @@
}
}
- public SchemeComparDto SchemeCompar(String[] taskList, Long showProductId) {
- SchemeComparDto dto = new SchemeComparDto();
+ public SimulatResult SchemeCompar(String[] taskList, Long showProductId, Integer samplPeriod, Integer simulatFrequency) {
+ SimulatResult simulatResult = new SimulatResult();
+ List<Long> idList = new ArrayList<>();
+ List<TaskModelCheckResultDto> result = null;
+/* SchemeComparDto dto = new SchemeComparDto();
List<SimulaDataDto> dataDtoList = new ArrayList<>();
List<SchemeComparCurve> curveList = new ArrayList<>();
List<Double> xData = new ArrayList<>();
- SimulatAssess simulatAssess;
- SimulaDataDto data;
+
+ SimulaDataDto data;*/
+
+ List<SimulatAssess> simulatAssessList = new ArrayList<>();
Task task;
+ double maxTaskDuration = 0.0;
for (String taskId : taskList) {
- Long taskModelId = Long.parseLong(taskId);
- task = taskService.get(taskModelId);
- simulatAssess = this.getByTaskId(taskModelId);
- SimulaDataDto resultData;
- if (showProductId != null) {
- simulatAssess.setProductId(showProductId);
- resultData = this.getResultXML(simulatAssess);
- } else {
- resultData = this.getResultXML(simulatAssess);
+ task = taskService.get(Long.parseLong(taskId));
+ if (task.getTaskDuration() > maxTaskDuration) {
+ maxTaskDuration = task.getTaskDuration();
}
- data = resultData;
- data.setName(task.getTaskName());
- dataDtoList.add(data);
- xData = resultData.getCurveParam().getXData();
+ SimulatAssess simulatAssess = new SimulatAssess();
+ Long id = UUIDUtil.generateId();
+ simulatAssess.setId(id);
+ simulatAssess.setName("");
+ simulatAssess.setProductId(showProductId);
+ simulatAssess.setSamplPeriod(samplPeriod);
+ simulatAssess.setSimulatFrequency(simulatFrequency);
+ simulatAssess.setTaskDuration(maxTaskDuration);
+ simulatAssess.setTaskModelId(Long.parseLong(taskId));
- SchemeComparCurve curve = new SchemeComparCurve();
- curve.setName(task.getTaskName());
- curve.setSmooth(true);
- curve.setType("line");
- curve.setData(resultData.getCurveParam().getYData());
- curveList.add(curve);
+ simulatAssessList.add(simulatAssess);
+ result = simulateChecK(simulatAssess);
+ if (result!=null){
+ simulatResult.setType("errorList");
+ simulatResult.setErrList(result);
+ return simulatResult;
+ }
+ idList.add(id);
}
- dto.setXDataList(xData);
- dto.setDataList(dataDtoList);
- dto.setCurveList(curveList);
- return dto;
+
+ for (SimulatAssess simulatAssess : simulatAssessList) {
+ simulatAssess.setTaskDuration(maxTaskDuration);
+ this.simulate(simulatAssess);
+ }
+
+ simulatResult.setType("idList");
+ simulatResult.setIdList(idList);
+ return simulatResult;
}
public SimulaDataDto getResultXML(SimulatAssess simulatAssess) {
@@ -1235,4 +1438,134 @@
}
return data;
}
+
+ public String verify(Long taskId) {
+ StringBuilder result = new StringBuilder();
+ Task task = taskService.get(taskId);
+ double taskTime = task.getTaskDuration();
+ List<OperatConditModel> list = baseDao.getModel(taskId);
+ List<Double> reliabiyList = new ArrayList<>();
+ String modelStr2 = "";
+ for (OperatConditModel model : list) {
+ if (model.getProductId().equals(task.getProductId())) {
+ modelStr2 = model.getContent();
+ continue;
+ }
+ List<verifyDto> listNodes = baseDao.getNode(model.getModelId());
+ for (verifyDto node : listNodes) {
+ //lmd,reliabiy,failRate
+ double lmd = 1 / node.getMtbf();
+ double reliabiy = Math.exp(-1 * lmd * taskTime);
+ double failRate = 1 - reliabiy;
+ node.setLmd(lmd);
+ node.setReliabiy(reliabiy);
+ node.setFailRate(failRate);
+ }
+ int total = listNodes.size();
+ String modelStr = model.getContent();
+ //鎵惧埌琛ㄥ喅鏁伴噺
+
+ if (modelStr.contains("switch")) {
+ double a = 0;
+ double lmd = listNodes.get(0).getLmd();
+ result.append("\n").append(total).append("涓浉鍚岃澶囨梺鑱�,3閫�1,MTTBCF鏄�").append(listNodes.get(0).getMtbf()).append("\n");
+ for (int i = 0; i <= total - 1; i++) {
+ double ijc = getjc(i);
+ double b = Math.pow(taskTime * lmd, i) * Math.exp(-1 * lmd * taskTime) / ijc;
+ a = a + b;
+ result.append("鏈�").append(i + 1).append("涓澶囧ソ鐨勭殑姒傜巼涓�").append(b).append("\n");
+ }
+ result.append("鏁翠釜鏃佽仈绯荤粺鐨勫彲闈犲害涓�").append(new Formatter().format("%.4f", a)).append("\n");
+ reliabiyList.add(a);
+ } else if (modelStr.contains("parallel")) {
+ double a = 1;
+ result.append("\n骞惰仈璁惧鏈�").append(total).append("涓猏n");
+ for (int i = 0; i < listNodes.size(); i++) {
+ a = a * listNodes.get(i).getFailRate();
+ result.append("绗�").append(i + 1).append("涓澶囩殑MTBCF涓�").append(listNodes.get(i).getMtbf()).append(",").append(i + 1).append("涓澶囧苟鑱旂殑澶辨晥鐜囦负").append(a).append("\n");
+ }
+ double reliabiy = 1 - a;
+ result.append("鏁翠釜骞惰仈绯荤粺鐨勫け鏁堢巼涓�").append(a).append("鏁翠釜骞惰仈绯荤粺鐨勫彲闈犲害涓�").append(new Formatter().format("%.4f", reliabiy)).append("\n");
+ reliabiyList.add(reliabiy);
+ } else if (modelStr.contains("vote")) {
+ Integer voteNum = baseDao.getVoteNum(model.getModelId());
+ if (voteNum != null) {
+ result.append("\n").append(total).append("涓浉鍚岃澶囪〃鍐�,MTBCF涓�").append(listNodes.get(0).getMtbf()).append("琛ㄥ喅鏁伴噺涓�").append(voteNum).append("涓猏n");
+ double a = 0;
+ double zjc = getjc(total);
+ double reliabiy = listNodes.get(0).getReliabiy();
+ for (int i = voteNum; i <= total; i++) {
+ double ijc = getjc(i);
+ double nijc = getjc(total - i);
+ double b = (zjc / (ijc * nijc)) * Math.pow(reliabiy, i) * Math.pow(1 - reliabiy, total - i);
+ a = a + b;
+ result.append("鏈�").append(i).append("涓澶囨槸濂界殑姒傜巼涓�").append(b).append("\n");
+ }
+ result.append("鏁翠釜琛ㄥ喅绯荤粺鐨勫彲闈犲害涓�").append(new Formatter().format("%.4f", a)).append("\n");
+ reliabiyList.add(a);
+ }
+
+ }
+ }
+ double totalReliabiy = 1;
+ if (modelStr2.contains("parallel")) {
+ for (Double reliabiy : reliabiyList) {
+ totalReliabiy = totalReliabiy * (1 - reliabiy);
+ }
+ totalReliabiy = 1 - totalReliabiy;
+ } else {
+ for (Double reliabiy : reliabiyList) {
+ totalReliabiy = totalReliabiy * reliabiy;
+ }
+ }
+ result.append("\n鏁翠釜鎬讳綋绯荤粺鐨勫彲闈犲害涓�").append(totalReliabiy).append("\n");
+ return String.valueOf(result);
+ }
+
+ Double getjc(int a) {
+ double result = 1.0;
+ for (int i = a; i > 0; i--)
+ result = result * i;
+ return result;
+ }
+
+ public SchemeComparDto getEcharts(String[] taskList, Long showProductId) {
+ SchemeComparDto dto = new SchemeComparDto();
+ List<SimulaDataDto> dataDtoList = new ArrayList<>();
+ List<SchemeComparCurve> curveList = new ArrayList<>();
+ List<Double> xData = new ArrayList<>();
+ SimulatAssess simulatAssess;
+ SimulaDataDto data;
+
+ Task task;
+ for (String taskId : taskList) {
+ Long taskModelId = Long.parseLong(taskId);
+ task = taskService.get(taskModelId);
+ simulatAssess = this.getByTaskId(taskModelId);
+ simulatAssess.setDataType("fz");
+ SimulaDataDto resultData;
+ if (showProductId != null) {
+ simulatAssess.setProductId(showProductId);
+ resultData = this.getResultXML(simulatAssess);
+ } else {
+ resultData = this.getResultXML(simulatAssess);
+ }
+
+ data = resultData;
+ data.setName(task.getTaskName());
+ dataDtoList.add(data);
+ xData = resultData.getCurveParam().getXData();
+
+ SchemeComparCurve curve = new SchemeComparCurve();
+ curve.setName(task.getTaskName());
+ curve.setSmooth(true);
+ curve.setType("line");
+ curve.setData(resultData.getCurveParam().getYData());
+ curveList.add(curve);
+ }
+ dto.setXDataList(xData);
+ dto.setDataList(dataDtoList);
+ dto.setCurveList(curveList);
+ return dto;
+ }
}
--
Gitblit v1.9.1