From 3c2e46fef0e866901cbb5de889166b6fda748e5d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:39:09 +0800
Subject: [PATCH] 同类设备有多个的修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java | 3 +++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 5 +++--
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java | 2 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 8 ++++++++
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
index c7bae6a..c828318 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
@@ -40,6 +40,9 @@
@ApiModelProperty(value = "")
private String name;
+ @ApiModelProperty(value = "璁惧搴忓彿")
+ private Integer deviceNo;
+
@ApiModelProperty(value = "琛ㄥ喅鏁�")
private Integer voteNum;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
index 56aa5ed..87c6ebf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
@@ -20,6 +20,8 @@
private String algorithmType;
private Integer voteNum;
private Long dataId;
+ private Integer deviceNo;
+
private double x;
private double y;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
index b1c6c3c..ffd26cb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
@@ -366,6 +366,12 @@
String productType = JsonUtils2.getJsonValueByPath(jsonObject, "data/productType".split("/")).toString();
productImg.setProductType(productType);
if ("product_sb".equals(productType)) {
+ jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/deviceNo".split("/"));
+ if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
+ modelNode.setVoteNum(Integer.valueOf(jsonValue.toString()));
+ } else {
+ modelNode.setDeviceNo(0);
+ }
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
productImg.setReliabDistribType(Integer.valueOf(jsonValue.toString()));
@@ -489,6 +495,7 @@
treeNode.setNodeType(node.getNodeType());
treeNode.setPicId(node.getPicId());
treeNode.setDataId(node.getDataId());
+ treeNode.setDeviceNo(node.getDeviceNo());
treeNode.setObjectWidth(node.getWidth());
treeNode.setObjectHeight(node.getHeight());
parent.getChildren().add(treeNode);
@@ -785,6 +792,7 @@
node.setId(root.getId());
node.setPicId(root.getPicId());
node.setDataId(root.getDataId());
+ node.setDeviceNo(root.getDeviceNo());
node.setNodeType(root.getNodeType());
node.setName(root.getName());
node.setVoteNum(root.getVoteNum());
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 f6132a6..0f94aaa 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
@@ -1008,9 +1008,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");
--
Gitblit v1.9.1