From b03320ae317b7ff09ea1450c0f831f24fe7018e1 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 04 十一月 2024 08:45:06 +0800
Subject: [PATCH] 增加可靠性评定时模型及参数检查
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java | 284 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TaskModelCheckResultDto.java | 7 +
2 files changed, 284 insertions(+), 7 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TaskModelCheckResultDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TaskModelCheckResultDto.java
index cdced77..221f65b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TaskModelCheckResultDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TaskModelCheckResultDto.java
@@ -4,12 +4,19 @@
@Data
public class TaskModelCheckResultDto {
+ // 鍙潬鎬т豢鐪熻瘎浼�
public final static String CATEGORY_TASK_TIME = "浠诲姟鎬绘椂闀挎湭閰嶇疆";
public final static String CATEGORY_PHASE_TIME = "闃舵鏃堕暱鏈厤缃�";
public final static String CATEGORY_GK_TIME = "宸ュ喌鏃堕暱鏈厤缃�";
public final static String CATEGORY_GK_MODEL = "宸ュ喌妯″瀷鏍戜笉瀹屾暣";
public final static String CATEGORY_MODEL = "寤烘ā鏈畬鎴�";
public final static String CATEGORY_PARAM = "璁惧鍙傛暟鏈厤缃�";
+ // 鍙潬鎬ц瘎瀹�
+ public final static String CATEGORY_MULTI_PHASE = "鐩墠涓嶆敮鎸佸闃舵";
+ public final static String CATEGORY_MULTI_GK = "鐩墠涓嶆敮鎸佸宸ュ喌";
+ public final static String CATEGORY_MODEL_NOT_SUPPORT = "鐩墠涓嶆敮鎸佷覆鑱斻�佸苟鑱斿拰琛ㄥ喅浠ュ鐨勬ā鍨�";
+ public final static String CATEGORY_DISTRIBUTION_NOT_SUPPORT = "鐩墠涓嶆敮鎸佷簩椤瑰垎甯冨拰鎸囨暟鍒嗗竷浠ュ鐨勫垎甯冪被鍨�";
+ public final static String CATEGORY_NO_ASSESS_DATA = "璇勫畾鏁版嵁鏈綍鍏�";
private String category; // 妫�鏌ョ粨鏋滃垎绫�
private Long productId; // 浜у搧缁撴瀯鏍戣妭鐐笽D锛堜负浠诲姟鍙潬鎬у缓妯″璞¤妭鐐癸紝涓�鑸负鎬讳綋锛�
private Long taskId; // 浠诲姟ID
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
index d79a8b5..4c947b3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
@@ -67,13 +67,13 @@
}
/**
- * 瀵逛换鍔″彲闈犳�фā鍨嬪強鍏跺弬鏁伴厤缃繘琛屽畬鏁存�ф鏌ワ紝骞舵寚鍑轰互涓�5绫婚敊璇細
- * 0锛変换鍔℃�绘椂闀挎湭閰嶇疆
- * 1锛夐樁娈垫椂闀挎湭閰嶇疆
- * 2锛夊伐鍐垫椂闀挎湭閰嶇疆
- * 3锛夊伐鍐垫ā鍨嬫爲涓嶅畬鏁�
- * 4锛夊缓妯℃湭瀹屾垚
- * 5锛夎澶囧弬鏁版湭閰嶇疆
+ * 鍙潬鎬т豢鐪熻瘎浼帮細瀵逛换鍔″彲闈犳�фā鍨嬪強鍏跺弬鏁伴厤缃繘琛屽畬鏁存�ф鏌ワ紝骞舵寚鍑轰互涓�6绫婚敊璇細
+ * 1锛変换鍔℃�绘椂闀挎湭閰嶇疆
+ * 2锛夐樁娈垫椂闀挎湭閰嶇疆
+ * 3锛夊伐鍐垫椂闀挎湭閰嶇疆
+ * 4锛夊伐鍐垫ā鍨嬫爲涓嶅畬鏁�
+ * 5锛夊缓妯℃湭瀹屾垚
+ * 6锛夎澶囧弬鏁版湭閰嶇疆
* 鍙互瀵规墍鏈変换鍔℃ā鍨嬭繘琛屾鏌ワ紝涔熷彲浠ュ彧妫�鏌ュ叆鍙傛寚瀹氱殑浜у搧鑺傜偣涓嬬殑浠诲姟妯″瀷锛涘墠鑰呴�傚悎鍦ㄩ〉闈㈠垪琛ㄦ樉绀哄叏浣撳缓妯＄姸鎬侊紝鍚庤�呴�傚悎瀵规煇浠诲姟杩涜浠跨湡鏃剁殑妫�鏌ャ��
*
* @param productId 浜у搧鑺傜偣ID锛堜竴鑸负鎬讳綋锛�
@@ -296,6 +296,276 @@
}
+ /**
+ * 鍙潬鎬ц瘎瀹氾細瀵逛换鍔″彲闈犳�фā鍨嬨�佸弬鏁伴厤缃�佸彲闈犳�ц瘎瀹氭暟鎹繘琛屽畬鏁存�ф鏌ワ紝骞舵寚鍑轰互涓�11绫婚敊璇細
+ * 1锛変换鍔℃�绘椂闀挎湭閰嶇疆
+ * 2锛夌洰鍓嶄笉鏀寔澶氶樁娈�
+ * 3锛夐樁娈垫椂闀挎湭閰嶇疆
+ * 4锛夌洰鍓嶄笉鏀寔澶氬伐鍐�
+ * 5锛夊伐鍐垫椂闀挎湭閰嶇疆
+ * 6锛夊伐鍐垫ā鍨嬫爲涓嶅畬鏁�
+ * 7锛夊缓妯℃湭瀹屾垚
+ * 8锛夌洰鍓嶄笉鏀寔涓茶仈銆佸苟鑱斿拰琛ㄥ喅浠ュ鐨勬ā鍨�
+ * 9锛夎澶囧弬鏁版湭閰嶇疆
+ * 10锛夌洰鍓嶄笉鏀寔浜岄」鍒嗗竷鍜屾寚鏁板垎甯冧互澶栫殑鍒嗗竷绫诲瀷
+ * 11锛夎瘎瀹氭暟鎹湭褰曞叆
+ * 鍙互瀵规墍鏈変换鍔℃ā鍨嬭繘琛屾鏌ワ紝涔熷彲浠ュ彧妫�鏌ュ叆鍙傛寚瀹氱殑浜у搧鑺傜偣涓嬬殑浠诲姟妯″瀷锛涘墠鑰呴�傚悎鍦ㄩ〉闈㈠垪琛ㄦ樉绀哄叏浣撳缓妯＄姸鎬侊紝鍚庤�呴�傚悎瀵规煇浠诲姟杩涜浠跨湡鏃剁殑妫�鏌ャ��
+ *
+ * @param productId 浜у搧鑺傜偣ID锛堜竴鑸负鎬讳綋锛�
+ * @return 妫�鏌ュ嚭鐨勯敊璇殑List锛岄暱搴︿负0琛ㄧず娌℃湁閿欒锛屼笉浼氳繑鍥瀗ull
+ */
+ public List<TaskModelCheckResultDto> checkTaskModelAssess(Long productId, Long taskId) {
+ List<TaskModelCheckResultDto> checkResult = new ArrayList<>();
+ List<XhProductModel> deviceUsedList = new ArrayList<>(); // 妫�鏌ュ璞℃ā鍨嬩腑浣跨敤鍒扮殑鎵�鏈夎澶�
+
+ // 1. 鑾峰彇鏁版嵁
+ // 1.1 鑾峰彇鎵�鏈変换鍔℃暟鎹甃ist
+ List<Task> taskList = baseDao.getTasks(productId, taskId);
+ // 1.2 鑾峰彇鎵�鏈変换鍔￠樁娈垫暟鎹甃ist
+ List<TaskPhase> taskPhaseList = baseDao.getTaskPhases(productId, taskId);
+ // 1.3 鑾峰彇鎵�鏈変换鍔″伐鍐垫暟鎹甃ist
+ List<TaskPhaseModel> taskPhaseModelList = baseDao.getTaskPhaseModels(productId, taskId);
+ // 1.4 鑾峰彇浜у搧缁撴瀯鏍戠粨鏋勬暟鎹�
+ List<XhProductModel> productTreeList = xhProductModelDao.getProductTree(productId);
+ // 1.5 鑾峰彇鎵�鏈夊伐鍐垫ā鍨嬫爲鏁版嵁List
+ List<OperatConditModel> gkModelList = operatConditModelDao.getGKModelTrees(productId);
+ // 1.6 鑾峰彇鎵�鏈塕BD鏁版嵁List
+ List<ModelRbd> modelRbdList = modelRbdDao.getListAll();
+ // 1.7 鑾峰彇鎵�鏈夋ā鍨嬪寘鍚殑鑺傜偣鏁版嵁
+ List<ModelNodeAlgorithm> rbdNodeList = modelNodeAlgorithmDao.getRbdNodes();
+ // 1.8 鑾峰彇璇ヨ埞鐨勬墍鏈夎澶囧弬鏁癓ist
+ List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
+ // 1.8 鑾峰彇璇ヤ换鍔＄殑浜岄」鍒嗗竷鍙傛暟锛塋ist
+ List<TaskBinoParam> binoParamList = taskBinoParamDao.getBinoParams(taskId);
+
+ // 2. 妫�鏌ユ瘡涓换鍔℃ā鍨嬬殑鏁版嵁瀹屾暣鎬�
+ for (Task task : taskList) {
+ if (null == task.getTaskDuration() || 0.0 == task.getTaskDuration()) {
+ // 2.1 浠诲姟鎬绘椂闀挎湭閰嶇疆
+ setTaskModelCheckResult(task, null, null,
+ null, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_TASK_TIME, checkResult);
+ }
+ List<TaskPhase> phases = taskPhaseList.stream().filter(item ->
+ task.getId().equals(item.getTaskId())).collect(Collectors.toList());
+ if (phases.size() > 1) {
+ // 2.2 鐩墠涓嶆敮鎸佸闃舵
+ setTaskModelCheckResult(task, null, null,
+ null, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_MULTI_PHASE, checkResult);
+ } else if (phases.size() <= 0){
+ // 2.3 闃舵鏃堕暱鏈厤缃�
+ setTaskModelCheckResult(task, null, null,
+ null, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_PHASE_TIME, checkResult);
+ } else {
+ TaskPhase phase = phases.get(0);
+ if (null == phase.getPhaseDurationRate() || 0.0 == phase.getPhaseDurationRate()) {
+ // 2.3 闃舵鏃堕暱鏈厤缃�
+ setTaskModelCheckResult(task, phase, null,
+ null, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_PHASE_TIME, checkResult);
+ }
+ List<TaskPhaseModel> phaseModels = taskPhaseModelList.stream().filter(item ->
+ phase.getId().equals(item.getPhaseId()) && 0.0 != item.getOperatConditDurationRate()).
+ collect(Collectors.toList());
+ if (phaseModels.size() > 1) {
+ // 2.4 鐩墠涓嶆敮鎸佸宸ュ喌
+ setTaskModelCheckResult(task, phase, null,
+ null, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_MULTI_GK, checkResult);
+ } else if (phaseModels.size() <= 0) {
+ // 2.5 宸ュ喌鏃堕暱鏈厤缃�
+ setTaskModelCheckResult(task, phase, null,
+ null, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_GK_TIME, checkResult);
+ } else {
+ // 鏈夊伐鍐佃閫夌敤锛屾鏌ラ�夌敤鐨勫伐鍐�
+ TaskPhaseModel taskPhaseModel = phaseModels.get(0);
+ List<OperatConditModel> gkModelTree = gkModelList.stream().filter(item ->
+ taskPhaseModel.getOperatConditId().equals(item.getOperatConditId())).collect(Collectors.toList());
+ if (gkModelTree.size() <= 0) {
+ // 鏃犲伐鍐垫ā鍨嬫爲
+ XhProductModel node = productTreeList.stream().filter(item ->
+ task.getProductId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ // 2.6 宸ュ喌妯″瀷鏍戜笉瀹屾暣
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_GK_MODEL, checkResult);
+ } else {
+ // 鏈夊伐鍐垫ā鍨嬫爲锛屾鏌ュ叾瀹屾暣鎬�
+ for (OperatConditModel gkModel : gkModelTree) {
+ XhProductModel node = productTreeList.stream().filter(item ->
+ gkModel.getProductId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ if (null == gkModel.getModelId()) {
+ // 2.6 宸ュ喌妯″瀷鏍戜笉瀹屾暣
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_GK_MODEL, checkResult);
+ } else {
+ List<ModelRbd> modelRbds = modelRbdList.stream().filter(item ->
+ gkModel.getModelId().equals(item.getId())).collect(Collectors.toList());
+ if (modelRbds.size() == 0) {
+ // 2.7 寤烘ā鏈畬鎴�
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, null, null, null,
+ TaskModelCheckResultDto.CATEGORY_MODEL, checkResult);
+ } else {
+ if (!"宸插畬鎴�".equals(modelRbds.get(0).getModelState())) {
+ // 2.7 寤烘ā鏈畬鎴�
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), null, null,
+ TaskModelCheckResultDto.CATEGORY_MODEL, checkResult);
+ } else {
+ List<Algorithm> algorithmList = algorithmDao.getListByModelId(gkModel.getModelId());
+ if (hasNotSupportModel(algorithmList)) {
+ // 2.8 鐩墠涓嶆敮鎸佷覆鑱斻�佸苟鑱斿拰琛ㄥ喅浠ュ鐨勬ā鍨�
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), null, null,
+ TaskModelCheckResultDto.CATEGORY_MODEL_NOT_SUPPORT, checkResult);
+ } else {
+ List<ModelNodeAlgorithm> deviceNodes = rbdNodeList.stream().filter(item ->
+ gkModel.getModelId().equals(item.getModelId())).collect(Collectors.toList());
+ for (ModelNodeAlgorithm deviceNode : deviceNodes) {
+ XhProductModel device = (XhProductModel) productTreeList.stream().filter(item ->
+ deviceNode.getDataId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ if ("5".equals(device.getProductType())) {
+ // 璁惧
+ List<ParamData> params = paramDataList.stream().filter(item ->
+ deviceNode.getDataId().equals(item.getProductId())).collect(Collectors.toList());
+ if (params.size() == 0) {
+ // 璁惧鍙傛暟鏈厤缃�
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, null,
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ } else {
+ ParamData param = params.get(0);
+ if (param.getReliabDistribType() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "鍙潬鎬у垎甯冪被鍨�",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ } else {
+ if (param.getReliabDistribType() == 1) {
+ // 鎸囨暟鍒嗗竷
+ if (param.getTaskMtbcfRegulate() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTBCF",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ }
+ if (param.getReliabDistribType() == 2) {
+ // 濞佸竷灏斿垎甯�
+ if (param.getTaskMtbcfRegulate() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTBCF",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ if (param.getTaskMtbcfOtherParams2() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTBCF鍙傛暟2",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ if (param.getTaskMtbcfOtherParams3() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTBCF鍙傛暟3",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ }
+ if (param.getReliabDistribType() == 3) {
+ // 浜岄」鍒嗗竷
+ List<TaskBinoParam> binoParams = binoParamList.stream().filter(item ->
+ phase.getId().equals(item.getPhaseId()) &&
+ taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()) &&
+ modelRbds.get(0).getId().equals(item.getModelId()) &&
+ device.getId().equals(item.getProductId())).collect(Collectors.toList());
+ if (binoParams.size() == 0) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "浜岄」鍒嗗竷鍙傛暟",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ } else {
+ TaskBinoParam binoParam = binoParams.get(0);
+ if (binoParam.getSuccessRate() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "鎴愬姛鐜�",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ } else {
+ if (binoParam.getSuccessTimes() != null && binoParam.getSimulatTimes() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "鎬绘鏁�",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ if (binoParam.getSuccessTimes() == null && binoParam.getSimulatTimes() != null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "鎴愬姛娆℃暟",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ }
+ }
+ }
+ if (1 == param.getRepairable()) {
+ // 鍙淮淇�
+ if (param.getRepairDistribType() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "缁翠慨鍒嗗竷绫诲瀷",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ if (param.getRepairDistribType() == 1) {
+ // 鎸囨暟鍒嗗竷
+ if (param.getRepairMttcr() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTTCR",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ }
+ if (param.getRepairDistribType() == 2) {
+ // 濞佸竷灏斿垎甯�
+ if (param.getRepairMttcr() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTTCR",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ if (param.getRepairMttcrOtherParams2() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTTCR鍙傛暟2",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ if (param.getRepairMttcrOtherParams3() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "MTTCR鍙傛暟3",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+ // 3. 杩斿洖妫�鏌ョ粨鏋�
+ return checkResult;
+
+ }
+
+ private boolean hasNotSupportModel(List<Algorithm> algorithmList) {
+ boolean result = false;
+ for (Algorithm algorithm : algorithmList) {
+ if ("switch,bridge".contains(algorithm.getAlgorithmType())) {
+ result = true;
+ break;
+ }
+ }
+ return result;
+ }
+
private void setTaskModelCheckResult(Task task,
TaskPhase taskPhase,
TaskPhaseModel taskPhaseModel,
--
Gitblit v1.9.1