From 664db98c9e8595ce4dd636a27f480e3a08b81ff5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 21 二月 2025 11:13:51 +0800
Subject: [PATCH] 新增可忽略的维修时间
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 542 +++++++++++++++++++++++++++++++++++++++++++++++++++++
web/public/产品结构树导入模板.xlsx | 0
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 3
web/src/views/modules/basicInfo/XhProductModel.vue | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java | 3
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 1
web/src/views/modules/basicInfo/ParamData.vue | 6
7 files changed, 551 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
index f3eda00..6c50226 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
@@ -103,6 +103,9 @@
@ApiModelProperty(value = "MTTCR鍏朵粬鍙傛暟3")
private Double repairMttcrOtherParams3;
+ @ApiModelProperty(value = "鍙互蹇界暐鐨勭淮淇椂闂�")
+ private Double negligibleRepairTime;
+
@ApiModelProperty(value = "鍙潬鎬у垎甯冪被鍨�")
private Integer reliabDistribType;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index ae0d6c5..e0f5dbd 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -249,6 +249,7 @@
String repairMttcrStr = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr
String repairMttcrOtherParams2Str = com.zt.core.shiro.ImportUtil.getCellValue(row, 19, pattern); //mttcr鍏朵粬鍙傛暟2
String repairMttcrOtherParams3Str = com.zt.core.shiro.ImportUtil.getCellValue(row, 20, pattern); //mttcr鍏朵粬鍙傛暟3
+ String negligibleRepairTimeStr = com.zt.core.shiro.ImportUtil.getCellValue(row, 21, pattern); //鍙拷鐣ョ殑缁翠慨鏃堕棿
Integer sameSbNum = StringUtils.isNotBlank(sameSbNumStr) ? Integer.parseInt(sameSbNumStr) : 1;
Double basicMtbfRegulate = StringUtils.isNotBlank(basicMtbfRegulateStr) ? Double.valueOf(basicMtbfRegulateStr) : null;
@@ -262,6 +263,7 @@
Double repairMttcr = StringUtils.isNotBlank(repairMttcrStr) ? Double.parseDouble(repairMttcrStr) : null;
Double repairMttcrOtherParams2 = StringUtils.isNotBlank(repairMttcrOtherParams2Str) ? Double.parseDouble(repairMttcrOtherParams2Str) : null;
Double repairMttcrOtherParams3 = StringUtils.isNotBlank(repairMttcrOtherParams3Str) ? Double.parseDouble(repairMttcrOtherParams3Str) : null;
+ Double negligibleRepairTime = StringUtils.isNotBlank(negligibleRepairTimeStr) ? Double.parseDouble(negligibleRepairTimeStr) : null;
if (StringUtils.isBlank(sb))
@@ -403,6 +405,7 @@
itemEntity.setRepairMttcr(repairMttcr);
itemEntity.setRepairMttcrOtherParams2(repairMttcrOtherParams2);
itemEntity.setRepairMttcrOtherParams3(repairMttcrOtherParams3);
+ itemEntity.setNegligibleRepairTime(negligibleRepairTime);
if (modelMap.get(sbPath) == null) {
paramDataService.insert(itemEntity);
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
index 5486365..63a58e3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -103,6 +103,7 @@
return Result.ok(result);
}
Boolean result2 = simulatAssessService.simulate(simulatAssess);
+// Boolean result2 = simulatAssessService.mySimulate(simulatAssess);
if (result2)
return Result.ok();
else
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 11537ef..af14543 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
@@ -8,7 +8,7 @@
import com.zt.common.db.query.QueryFilter;
import com.zt.common.exception.RenException;
import com.zt.common.service.BaseService;
-import com.zt.common.servlet.Result;
+import com.zt.common.utils.CommonUtils;
import com.zt.common.utils.TreeUtils;
import com.zt.common.utils.UUIDUtil;
import com.zt.life.export.service.DownloadService;
@@ -27,7 +27,7 @@
import com.zt.life.modules.mainPart.taskReliability.model.*;
import com.zt.life.modules.mainPart.utils.GetStringSpace;
import com.zt.life.modules.mainPart.utils.OSUtils.ProcessUtils;
-import io.swagger.models.auth.In;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.Document;
@@ -51,10 +51,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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;
@@ -1127,6 +1124,10 @@
failureTag.addAttribute("name", failureModel.getId().toString());
if (1 == paramData.getRepairable()) {
+ // 鍙拷鐣ョ殑缁翠慨鏃堕棿
+ if (paramData.getNegligibleRepairTime() != null && paramData.getNegligibleRepairTime().doubleValue() > 0) {
+ nodeTag.addAttribute("negligible_repair_time", String.valueOf(paramData.getNegligibleRepairTime()));
+ }
// 鍙淮淇�
RepairModel repairModel = null;
if (isRepairDirac(simulatAssess.getRepairDiracFlag(), taskPhaseModel, product.getId())) {
@@ -1757,4 +1758,535 @@
}
}
}
+/*
+ public Boolean mySimulate(SimulatAssess simulatAssess) {
+ logger.info("浠跨湡璇勪及寮�濮�");
+ // 1. 浠跨湡鍒濆鍖�
+ SimulateStaticDataDto simulateStaticDataDto = new SimulateStaticDataDto();
+ SimulateDynamicDataDto simulateDynamicDataDto = new SimulateDynamicDataDto();
+ initSimulate(simulatAssess, simulateStaticDataDto, simulateDynamicDataDto);
+ logger.info("浠跨湡璇勪及鍒濆鍖栧畬鎴�");
+
+ // 2. 浠跨湡澶勭悊
+ for (int i = 0; i < simulatAssess.getSimulatFrequency(); i++) {
+ doSimulate(i, simulatAssess, simulateStaticDataDto, simulateDynamicDataDto);
+ }
+ logger.info("浠跨湡璇勪及浠跨湡澶勭悊瀹屾垚");
+
+ return true;
+ }
+
+ private void initSimulate(SimulatAssess simulatAssess,
+ SimulateStaticDataDto simulateStaticDataDto,
+ SimulateDynamicDataDto simulateDynamicDataDto) {
+ Date beginDate = new Date();
+ XhProductModel product = xhProductModelDao.getById(simulatAssess.getProductId());
+ List<XhProductModel> productList = xhProductModelDao.getByShipId(product.getId());
+ List<ParamData> paramDataList = paramDataDao.getDeviceParams(product.getId());
+ Task task = taskService.get(simulatAssess.getTaskModelId());
+ if (simulatAssess.getTaskDuration() != null) {
+ task.setTaskDuration(simulatAssess.getTaskDuration());
+ }
+ List<TaskBinoParam> binoParams = taskBinoParamDao.getBinoParams(task.getId());
+
+ // 1. 璁＄畻鍚勪换鍔￠樁娈电殑杩愯鏃堕暱
+ List<TaskPhase> taskPhases = calcTaskPhaseDuration(task);
+ // 2. 璁＄畻鍚勫伐鍐垫ā鍨嬬殑杩愯鏃堕暱
+ List<TaskPhaseModel> taskPhaseModelAll = new ArrayList<>();
+ for (TaskPhase taskPhase : taskPhases) {
+ calcTaskPhaseModelDuration(taskPhase, taskPhaseModelAll);
+ }
+ Date date1 = new Date();
+ logger.info("鏁版嵁鍑嗗鏃堕棿锛�" + CommonUtils.getDatePoor(date1, beginDate));
+ // 3. 灏嗗悇宸ュ喌妯″瀷閫掑綊鎷嗚В涓哄畬鏁寸殑鍙緵浠跨湡璁＄畻鐨勯樁娈靛伐鍐垫ā鍨嬫暟鎹�
+ createAllModelData(simulatAssess.getRepairDiracFlag(),
+ task.getId(),
+ product.getId(),
+ product.getName(),
+ product.getNamePath(),
+ productList,
+ paramDataList,
+ taskPhaseModelAll,
+ binoParams,
+ simulateStaticDataDto);
+ Date date2 = new Date();
+ logger.info("鐢熸垚闃舵宸ュ喌妯″瀷鏁版嵁鏃堕棿锛�" + CommonUtils.getDatePoor(date2, date1));
+ // 4. 鐢熸垚闈欐�佷簨浠跺垪琛�
+ createStaticEventList(simulateStaticDataDto, task.getTaskDuration());
+ Date date3 = new Date();
+ logger.info("鐢熸垚闈欐�佷簨浠跺垪琛ㄦ椂闂达細" + CommonUtils.getDatePoor(date3, date2));
+ // 5. 鐢熸垚鍔ㄦ�佷豢鐪熸暟鎹�
+ createDynamicSimulateData(simulatAssess, simulateStaticDataDto, simulateDynamicDataDto);
+ Date date4 = new Date();
+ logger.info("鐢熸垚鍔ㄦ�佷豢鐪熸暟鎹椂闂达細" + CommonUtils.getDatePoor(date4, date3));
+ // 6. 瀛樼洏
+ saveSimulatAssessTaskPhaseModel(simulatAssess,
+ task,
+ taskPhases,
+ taskPhaseModelAll);
+ }
+
+ private void createDynamicSimulateData(SimulatAssess simulatAssess,
+ SimulateStaticDataDto simulateStaticDataDto,
+ SimulateDynamicDataDto simulateDynamicDataDto) {
+ List<SimulateNode> nodeList = simulateDynamicDataDto.getNodeList();
+ Map<Long, SimulateModelData> modelDataMap = simulateStaticDataDto.getModelDataMap();
+ for (Long key : modelDataMap.keySet()) {
+ for (SimulateNode node : modelDataMap.get(key).getActualNodeList()) {
+ List<SimulateNode> nodes = nodeList.stream().filter(item ->
+ node.getId().equals(item.getId())).collect(Collectors.toList());
+ if (nodes.size() == 0) {
+ nodeList.add(node.clone());
+ }
+ }
+ }
+ simulateDynamicDataDto.setStaticNodeNum(nodeList.size());
+
+ for (SimulateNode node : nodeList) {
+ List<List<SimulateStatus>> statusData = new ArrayList<>();
+ node.setStatusData(statusData);
+ for (int i = 0; i < simulatAssess.getSimulatFrequency(); i++) {
+ List<SimulateStatus> statusList = new ArrayList<>();
+ statusData.add(statusList);
+ }
+ }
+ }
+
+ private void createStaticEventList(SimulateStaticDataDto simulateStaticDataDto, double taskDuration) {
+ Map<Long, SimulateModelData> modelDataMap = simulateStaticDataDto.getModelDataMap();
+ Map<Long, SimulatePhaseModel> modelStartTimeMap = simulateStaticDataDto.getModelStartTimeMap();
+ for (Long key : modelStartTimeMap.keySet()) {
+ // 1. 闃舵宸ュ喌妯″瀷鍒囨崲浜嬩欢
+ double startTime = modelStartTimeMap.get(key).getStartTime();
+ SimulateEvent event = new SimulateEvent();
+ event.setId(UUIDUtil.generateId());
+ event.setType(SimulateEvent.TYPE_MODEL_CHG);
+ event.setTime(startTime);
+ event.setNodeId(key.toString());
+ simulateStaticDataDto.getStaticEventList().add(event);
+
+ // 2. 鏈夎繍琛屾瘮鐨勮澶囪妭鐐圭殑cycon/cycoff浜嬩欢
+ List<SimulateNode> nodes = modelDataMap.get(key).getActualNodeList().stream().filter(item ->
+ item.getIsLeafNode() && item.getCycOffDuration() != null).collect(Collectors.toList());
+ if (nodes.size() > 0) {
+ List<SimulateEvent> cycEventList = new ArrayList<>();
+ simulateStaticDataDto.getCycEventMap().put(key, cycEventList);
+ for (SimulateNode node : nodes) {
+// event = new SimulateEvent();
+// event.setId(UUIDUtil.generateId());
+// event.setType(SimulateEvent.TYPE_CYCON);
+// event.setTime(startTime);
+// event.setNodeId(node.getId());
+// cycEventList.add(event);
+ event = new SimulateEvent();
+ event.setId(UUIDUtil.generateId());
+ event.setType(SimulateEvent.TYPE_CYCOFF);
+ event.setTime(startTime + node.getCycOnDuration());
+ event.setNodeId(node.getId());
+ cycEventList.add(event);
+ }
+ }
+ }
+
+ // 3. 浠跨湡缁撴潫浜嬩欢
+ SimulateEvent event = new SimulateEvent();
+ event.setId(UUIDUtil.generateId());
+ event.setType(SimulateEvent.TYPE_END);
+ event.setTime(taskDuration);
+ simulateStaticDataDto.getStaticEventList().add(event);
+ }
+
+ private void createAllModelData(boolean repairDiracFlag,
+ Long taskId,
+ Long productId,
+ String productName,
+ String productNamePath,
+ List<XhProductModel> productList,
+ List<ParamData> paramDataList,
+ List<TaskPhaseModel> taskPhaseModelAll,
+ List<TaskBinoParam> binoParams,
+ SimulateStaticDataDto simulateStaticDataDto) {
+ double startTime = 0;
+ for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
+ List<OperatConditModel> gkModelsAssembled = operatConditModelDao.getGKModelAssembled(
+ taskPhaseModel.getOperatConditId());
+ OperatConditModel gkModelTop = gkModelsAssembled.stream().filter(item ->
+ productId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
+ List<ModelNode> modelNodeAndVnodeList = modelNodeAlgorithmDao.getListByModelId(gkModelTop.getModelId());
+ List<Algorithm> algorithmList = algorithmDao.getListByModelId(gkModelTop.getModelId());
+ // 灏嗘ā鍨嬭浆鎹负Tree
+ SimulateNode root = new SimulateNode();
+ Algorithm endAlgo = algorithmList.stream().filter(item ->
+ "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);
+ Date beginDate = new Date();
+ node2Tree(repairDiracFlag,
+ taskId,
+ taskPhaseModel,
+ productId,
+ productName,
+ productNamePath,
+ productList,
+ paramDataList,
+ gkModelsAssembled,
+ algorithmList,
+ modelNodeAndVnodeList,
+ binoParams,
+ computerNode, root);
+ Date date1 = new Date();
+ logger.info("node2Tree鏃堕棿锛�" + CommonUtils.getDatePoor(date1, beginDate));
+ SimulateModelData simulateModelData = new SimulateModelData();
+ SimulateNode.treeToModelData(root, simulateModelData);
+ Date date2 = new Date();
+ logger.info("treeToModelData鏃堕棿锛�" + CommonUtils.getDatePoor(date2, date1));
+ simulateStaticDataDto.getModelDataMap().put(taskPhaseModel.getId(), simulateModelData);
+ SimulatePhaseModel simulatePhaseModel = new SimulatePhaseModel();
+ simulatePhaseModel.setId(taskPhaseModel.getId());
+ simulatePhaseModel.setStartTime(startTime);
+ simulateStaticDataDto.getModelStartTimeMap().put(taskPhaseModel.getId(), simulatePhaseModel);
+ startTime += taskPhaseModel.getOperatConditDuration();
+ }
+ }
+
+ // 閫掑綊鍑芥暟
+ private void node2Tree(boolean repairDiracFlag,
+ Long taskId,
+ TaskPhaseModel taskPhaseModel,
+ Long productId,
+ String productName,
+ String productNamePath,
+ List<XhProductModel> productList,
+ List<ParamData> paramDataList,
+ List<OperatConditModel> gkModelsAssembled,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ List<TaskBinoParam> binoParams,
+ ModelNode node,
+ SimulateNode simulateNode) {
+ if ("node".equals(node.getNodeType())) {
+ simulateNode.setIsActualNode(true);
+ Long dataId = node.getDataId();
+ XhProductModel product = productList.stream().filter(item ->
+ dataId.equals(item.getId())).collect(Collectors.toList()).get(0);
+ if ("3,4,10".contains(product.getProductType())) {
+ // 绯荤粺銆佸垎绯荤粺銆佽櫄鍗曞厓
+ OperatConditModel gkModel = gkModelsAssembled.stream().filter(item ->
+ dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
+ List<Algorithm> algorithmListSub = algorithmDao.getListByModelId(gkModel.getModelId());
+ List<ModelNode> modelNodeAndVnodeListSub = modelNodeAlgorithmDao.getListByModelId(gkModel.getModelId());
+ Algorithm endAlgo = algorithmListSub.stream().filter(item ->
+ "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);
+ node2Tree(repairDiracFlag,
+ taskId,
+ taskPhaseModel,
+ product.getId(),
+ product.getName(),
+ product.getNamePath(),
+ productList,
+ paramDataList,
+ gkModelsAssembled,
+ algorithmListSub,
+ modelNodeAndVnodeListSub,
+ binoParams,
+ computerNode, simulateNode);
+ } else if ("5".equals(product.getProductType())) {
+ // 璁惧
+ simulateNode.setIsLeafNode(true);
+ simulateNode.setFailureRate(1.0);
+ Integer deviceNo = node.getDeviceNo();
+ simulateNode.setId(dataId.toString() + "-" + deviceNo);
+ simulateNode.setName(product.getName() + "-" + deviceNo);
+ simulateNode.setNamePath(product.getNamePath());
+
+ ParamData paramData = paramDataList.stream().filter(item ->
+ dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
+ Double ratio = paramData.getTaskMtbcfOperatingRatio();
+ if (null != ratio && ratio != 1.0) {
+ // 闂存柇鍨嬭澶囩殑澶勭悊
+ simulateNode.setRunningRatio(ratio);
+ double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
+ double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
+ simulateNode.setCycOnDuration(cycon);
+ simulateNode.setCycOffDuration(cycdown);
+ }
+ TaskBinoParam taskBinoParam = null;
+ if (3 == paramData.getReliabDistribType()) {
+ // 浜岄」鍒嗗竷澶勭悊
+ taskBinoParam = binoParams.stream()
+ .filter(item -> taskId.equals(item.getTaskId()))
+ .filter(item -> taskPhaseModel.getPhaseId().equals(item.getPhaseId()))
+ .filter(item -> taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()))
+ .filter(item -> dataId.equals(item.getProductId()))
+ .collect(Collectors.toList()).get(0);
+ }
+ if (1 == paramData.getRepairable() &&
+ isRepairDirac(repairDiracFlag, taskPhaseModel, product.getId())) {
+ simulateNode.setIsRepairDirac(true);
+ } else {
+ simulateNode.setIsRepairDirac(false);
+ simulateNode.setFailureModel(createFailureModel(paramData, taskBinoParam));
+ }
+ if (1 == paramData.getRepairable()) {
+ // 鍙淮淇�
+ simulateNode.setRepairModel(createRepairModel(paramData));
+ }
+ }
+ } else {
+ // vnode锛堣繍绠楄妭鐐癸級
+ Algorithm algo = algorithmList.stream().filter(item ->
+ node.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ if (null == productId) {
+ simulateNode.setIsActualNode(false);
+ simulateNode.setId(algo.getId().toString());
+ } else {
+ simulateNode.setIsActualNode(true);
+ simulateNode.setId(productId.toString());
+ simulateNode.setName(productName);
+ simulateNode.setNamePath(productNamePath);
+ }
+ if (SimulateNode.LOGIC_TYPE_SERIES.equals(algo.getAlgorithmType())) {
+ simulateNode.setLogicType(SimulateNode.LOGIC_TYPE_SERIES);
+ } else if (SimulateNode.LOGIC_TYPE_PARALLEL.equals(algo.getAlgorithmType())) {
+ simulateNode.setLogicType(SimulateNode.LOGIC_TYPE_PARALLEL);
+ } else if (SimulateNode.LOGIC_TYPE_VOTE.equals(algo.getAlgorithmType())) {
+ simulateNode.setLogicType(SimulateNode.LOGIC_TYPE_VOTE);
+ simulateNode.setVoteNum(algo.getVoteNum());
+ } else if ("switch".equals(algo.getAlgorithmType())) {
+ simulateNode.setLogicType(SimulateNode.LOGIC_TYPE_STANDBY);
+ simulateNode.setVoteNum(algo.getVoteNum());
+ } else if ("warm_switch".equals(algo.getAlgorithmType())) {
+ simulateNode.setLogicType(SimulateNode.LOGIC_TYPE_WARM_STANDBY);
+ simulateNode.setVoteNum(algo.getVoteNum());
+ } else if (SimulateNode.LOGIC_TYPE_BRIDGE.equals(algo.getAlgorithmType())) {
+ simulateNode.setLogicType(SimulateNode.LOGIC_TYPE_BRIDGE);
+ }
+ String[] computerNodeListStr = algo.getComputerList().split(",");
+ for (String nodeStr : computerNodeListStr) {
+ SimulateNode sn = new SimulateNode();
+ simulateNode.getChildren().add(sn);
+ ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
+ nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ node2Tree(repairDiracFlag,
+ taskId,
+ taskPhaseModel,
+ null,
+ null,
+ null,
+ productList,
+ paramDataList,
+ gkModelsAssembled,
+ algorithmList,
+ modelNodeAndVnodeList,
+ binoParams,
+ mn, sn);
+ }
+ }
+ }
+
+ private void doSimulate(int sCnt, SimulatAssess simulatAssess,
+ SimulateStaticDataDto simulateStaticDataDto,
+ SimulateDynamicDataDto simulateDynamicDataDto) {
+ // 1. 浠跨湡浜嬩欢鍒濆鍖�
+ initSimulateEvent(simulateStaticDataDto, simulateDynamicDataDto);
+ // 2. 浠跨湡鏃堕挓鍒濆鍖�
+ double lastTime = 0.0;
+ // 3. 浠跨湡浜嬩欢姝诲惊鐜紙浠跨湡缁撴潫浜嬩欢閫�鍑猴級
+ for (;;) {
+ boolean hasModelChgEvent = false;
+ // 3.1 浠庝豢鐪熶簨浠跺垪琛ㄤ腑鏌ヨ鍑轰簨浠舵椂闂存渶灏忕殑浜嬩欢闆嗗悎
+ List<SimulateEvent> minEventList = getMinEventList(simulateDynamicDataDto.getEventList());
+ double currentTime = minEventList.get(0).getTime();
+ // 3.2 鏈�灏忔椂闂翠簨浠堕泦鍚堝鐞�
+ List<SimulateEvent> endEvents = minEventList.stream().filter(item ->
+ SimulateEvent.TYPE_END==item.getType()).collect(Collectors.toList());
+ if (endEvents.size() > 0) {
+ break;
+ }
+ List<SimulateEvent> modelChgEvents = minEventList.stream().filter(item ->
+ SimulateEvent.TYPE_MODEL_CHG==item.getType()).collect(Collectors.toList());
+ if (modelChgEvents.size() > 0) {
+ hasModelChgEvent = true;
+ SimulateEvent modelChgEvent = modelChgEvents.get(0);
+ // 3.2.1 鏂伴樁娈垫暟鎹姞杞�
+ loadNewModelData(simulateStaticDataDto, simulateDynamicDataDto, modelChgEvent);
+ }
+ List<SimulateNode> leafNodes = simulateDynamicDataDto.getNodeList().stream().filter(item ->
+ item.getIsLeafNode()).collect(Collectors.toList());
+ for (SimulateNode leafNode : leafNodes) {
+ // 3.2.2 鑰楁椂鍙婄姸鎬佸鐞嗭紙瀵规墍鏈夊彾瀛愯妭鐐瑰鐞嗭級
+ handleLifeAndStatus(currentTime-lastTime, currentTime, leafNode, simulateDynamicDataDto.getNodeList());
+ }
+ if (hasModelChgEvent) {
+ // 3.2.3 闃舵宸ュ喌妯″瀷鍒囨崲澶勭悊
+ // 浜岄」鍒嗗竷璁惧澶勭悊
+ // 绉婚櫎璇ラ樁娈靛垏鎹簨浠�
+ removeEvent(simulateDynamicDataDto, modelChgEvents.get(0));
+ }
+ List<SimulateEvent> cycoffEvents = minEventList.stream().filter(item ->
+ SimulateEvent.TYPE_CYCOFF==item.getType()).collect(Collectors.toList());
+ for (SimulateEvent cycoffEvent : cycoffEvents) {
+ // 3.2.4 cycoff浜嬩欢澶勭悊
+ SimulateNode node = simulateDynamicDataDto.getNodeList().stream().filter(item ->
+ cycoffEvent.getNodeId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ node.setStatus(SimulateStatus.STATUS_CYCDOWN);
+ // 绉婚櫎璇ycoff浜嬩欢
+ removeEvent(simulateDynamicDataDto, cycoffEvent);
+ }
+ // 3.2.5 杩唬澶勭悊
+
+ }
+ }
+
+ private void removeEvent(SimulateDynamicDataDto simulateDynamicDataDto, SimulateEvent event) {
+ Iterator<SimulateEvent> iterator = simulateDynamicDataDto.getEventList().iterator();
+ while (iterator.hasNext()) {
+ SimulateEvent item = iterator.next();
+ if (event.getId().equals(item.getId())) iterator.remove();
+ }
+ }
+
+ private void handleLifeAndStatus(double deltaTime,
+ double currentTime,
+ SimulateNode node,
+ List<SimulateNode> nodeList) {
+ // 鑰楁椂澶勭悊
+ if (SimulateStatus.STATUS_ACTIVE.equals(node.getStatus()) ||
+ SimulateStatus.STATUS_WARM.equals(node.getStatus())) {
+ node.setLifeTime(node.getLifeTime()-deltaTime*node.getFailureRate());
+ }
+ if (node.getRepairTime()>0 && node.getRepairModel()!=null) {
+ double repairTime = node.getRepairTime()-deltaTime;
+ if (repairTime < 0) repairTime = 0;
+ node.setRepairTime(repairTime);
+ }
+ // 鐘舵�佸鐞�
+ if (SimulateStatus.STATUS_ACTIVE.equals(node.getStatus()) &&
+ node.getLifeTime()<=0) {
+ if (node.getRepairModel()==null) {
+ node.setStatus(SimulateStatus.STATUS_FAILED);
+ } else {
+ node.setStatus(SimulateStatus.STATUS_MAINTENANCE);
+ double repairTime = createRepairTime(node.getRepairModel());
+ node.setRepairTime(repairTime);
+ node.setLifeTime(0.0);
+ node.getFailureEvent().setType(SimulateEvent.TYPE_EXPECT_REPAIR);
+ node.getFailureEvent().setTime(currentTime+repairTime);
+ }
+ setMayChangeStatus(node, nodeList);
+ }
+ if (SimulateStatus.STATUS_MAINTENANCE.equals(node.getStatus()) &&
+ node.getRepairTime()<=0) {
+ node.setStatus(SimulateStatus.STATUS_ACTIVE);
+ double lifeTime = createLifeTime(node.getFailureModel());
+ node.setLifeTime(lifeTime);
+ node.setRepairTime(0.0);
+ node.getFailureEvent().setType(SimulateEvent.TYPE_EXPECT_FAIL);
+ node.getFailureEvent().setTime(currentTime+lifeTime);
+ setMayChangeStatus(node, nodeList);
+ }
+ }
+
+ private void setMayChangeStatus(SimulateNode node,
+ List<SimulateNode> nodeList) {
+ node.setMayChangeStatus(true);
+ for (String pid : node.getPids()) {
+ SimulateNode pNode = nodeList.stream().filter(item ->
+ pid.equals(item.getId())).collect(Collectors.toList()).get(0);
+ pNode.setMayChangeStatus(true);
+ }
+ }
+
+ private void loadNewModelData(SimulateStaticDataDto simulateStaticDataDto,
+ SimulateDynamicDataDto simulateDynamicDataDto,
+ SimulateEvent modelChgEvent) {
+ // 鍒犻櫎浠跨湡鍔ㄦ�佹暟鎹腑鐨勮櫄鑺傜偣
+ Iterator<SimulateNode> iterator = simulateDynamicDataDto.getNodeList().iterator();
+ while (iterator.hasNext()) {
+ SimulateNode item = iterator.next();
+ if (!item.getIsActualNode()) iterator.remove();
+ }
+ // 鎵�鏈夊疄鑺傜偣鍒濆鍖栦负鏈娇鐢�
+ for (SimulateNode node : simulateDynamicDataDto.getNodeList()) {
+ node.setIsUsed(false);
+ }
+ // 鍔犲叆璇ラ樁娈靛伐鍐垫ā鍨嬬殑鎵�鏈夎櫄鑺傜偣
+ SimulateModelData modelData = simulateStaticDataDto.getModelDataMap().get(Long.valueOf(modelChgEvent.getNodeId()));
+ for (SimulateNode vnode : modelData.getVirtualNodeList()) {
+ simulateDynamicDataDto.getNodeList().add(vnode.clone());
+ }
+ // 鎶婅闃舵宸ュ喌妯″瀷涓殑鎵�鏈夊疄鑺傜偣鐨勫唴瀹规嫹璐濆埌浠跨湡鍔ㄦ�佹暟鎹腑鐨勫疄鑺傜偣
+ for (SimulateNode anode : modelData.getActualNodeList()) {
+ SimulateNode node = simulateDynamicDataDto.getNodeList().stream().filter(item ->
+ anode.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ node.setPid(anode.getPid());
+ node.setNamePath(anode.getNamePath());
+ node.setPids(anode.getCids());
+ node.setCids(anode.getCids());
+ node.setIsLeafNode(anode.getIsLeafNode());
+ node.setIsUsed(anode.getIsUsed());
+ node.setFailureRate(anode.getFailureRate());
+// node.setRunningRatio(anode.getRunningRatio());
+// node.setCycOnDuration(anode.getCycOnDuration());
+// node.setCycOffDuration(anode.getCycOffDuration());
+ node.setFailureModel(anode.getFailureModel());
+ node.setRepairModel(anode.getRepairModel());
+ node.setIsRepairDirac(anode.getIsRepairDirac());
+ node.setLogicType(anode.getLogicType());
+ node.setVoteNum(anode.getVoteNum());
+ node.setNodeNo(anode.getNodeNo());
+ }
+ // 鎶婅闃舵宸ュ喌妯″瀷涓殑cycoff浜嬩欢鍔犲叆鍒颁豢鐪熶簨浠跺垪琛�
+ List<SimulateEvent> cycEvents = simulateStaticDataDto.getCycEventMap().get(Long.valueOf(modelChgEvent.getNodeId()));
+ for (SimulateEvent event : cycEvents) {
+ simulateDynamicDataDto.getEventList().add(event);
+ }
+ }
+
+ private List<SimulateEvent> getMinEventList(List<SimulateEvent> eventList) {
+ List<SimulateEvent> result = new ArrayList<>();
+ double minTime = Double.MAX_VALUE;
+ for (SimulateEvent event : eventList) {
+ if (event.getTime() <= minTime) {
+ minTime = event.getTime();
+ result.add(event);
+ }
+ }
+ return result;
+ }
+
+ private void initSimulateEvent(SimulateStaticDataDto simulateStaticDataDto,
+ SimulateDynamicDataDto simulateDynamicDataDto) {
+ simulateDynamicDataDto.getEventList().clear();
+ simulateDynamicDataDto.getEventList().addAll(simulateStaticDataDto.getStaticEventList());
+
+ List<SimulateNode> leafNodeList = simulateDynamicDataDto.getNodeList().stream().filter(item ->
+ item.getIsLeafNode()).collect(Collectors.toList());
+ for (SimulateNode leafNode : leafNodeList) {
+ double lifeTime = createLifeTime(leafNode.getFailureModel());
+ // 涓轰簡鎻愰珮鏁堢巼锛屽姩鎬佷簨浠跺垪琛ㄥ強璁惧鑺傜偣閲屽悓鏃朵繚瀛橀鏈熸晠闅�/淇浜嬩欢瀹炰綋鐨勬寚閽�
+ SimulateEvent event = new SimulateEvent();
+ event.setId(UUIDUtil.generateId());
+ event.setType(SimulateEvent.TYPE_EXPECT_FAIL);
+ event.setTime(lifeTime);
+ event.setNodeId(leafNode.getId());
+ simulateDynamicDataDto.getEventList().add(event);
+ leafNode.setFailureEvent(event);
+ leafNode.setLifeTime(lifeTime);
+ leafNode.setRepairTime(0.0);
+ leafNode.setStatus(SimulateStatus.STATUS_ACTIVE);
+ }
+ }
+
+ private double createLifeTime(FailureModel failureModel) {
+ return 0.0;
+ }
+
+ private double createRepairTime(RepairModel repairModel) {
+ return 0.0;
+ }
+
+ */
}
diff --git "a/web/public/\344\272\247\345\223\201\347\273\223\346\236\204\346\240\221\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/web/public/\344\272\247\345\223\201\347\273\223\346\236\204\346\240\221\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 1744f00..d6c887c 100644
--- "a/web/public/\344\272\247\345\223\201\347\273\223\346\236\204\346\240\221\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/web/public/\344\272\247\345\223\201\347\273\223\346\236\204\346\240\221\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index a3ddbe7..63c3402 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -266,6 +266,12 @@
<span v-else v-text="scope.row.repairMttcrOtherParams3"></span>
</template>
</el-table-column>
+ <el-table-column prop="negligibleRepairTime" :key="28" label="鍙拷鐣ョ殑缁翠慨鏃堕棿" align="right">
+ <template slot-scope="scope">
+ <el-input v-if="scope.row.isEdit" v-model="scope.row.negligibleRepairTime"></el-input>
+ <span v-else v-text="scope.row.negligibleRepairTime"></span>
+ </template>
+ </el-table-column>
</el-table-column>
<el-table-column fixed="right" align="center" label="鎿嶄綔" width="100">
<template slot-scope="scope">
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 5683acf..01fab61 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -20,7 +20,7 @@
<el-form-item>
<zt-button v-if="productType && productType!=='10'" type="query" @click="table.query()"/>
<zt-button v-if="productType && productType!=='10'" type="add" @click="add()"/>
- <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">涓嬭浇妯℃澘
+ <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">涓嬭浇瀵煎叆妯℃澘
</zt-button>
<zt-button v-if="productType==='3'" type="primary" @click="addCell()">鏂板铏氬崟鍏�</zt-button>
<zt-button v-if="productType && productType!=='10'" type="delete" @click="table.deleteHandle()"/>
--
Gitblit v1.9.1