From ac18080bb1eecb943599f4a1c8842718d089485f Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 21 三月 2024 17:11:33 +0800
Subject: [PATCH] 将RBD转换为算法库所需的XML
---
modules/mainPart/pom.xml | 8 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/ParamDataDao.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java | 1
modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml | 9 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 185 ++++++++++++++++++++++++++++++++++-----------
modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml | 11 ++
modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml | 7 +
modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java | 1
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 7 +
modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml | 4
12 files changed, 189 insertions(+), 51 deletions(-)
diff --git a/modules/mainPart/pom.xml b/modules/mainPart/pom.xml
index 8fbd990..19f2f48 100644
--- a/modules/mainPart/pom.xml
+++ b/modules/mainPart/pom.xml
@@ -23,14 +23,11 @@
</repositories>
<dependencies>
-
<dependency>
<groupId>e-iceblue</groupId>
<artifactId>spire.doc.free</artifactId>
<version>3.9.0</version>
</dependency>
-
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -41,6 +38,11 @@
<version>2.6</version>
</dependency>
<dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId>
<version>1.16</version>
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/ParamDataDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/ParamDataDao.java
index 7c553cd..086fc89 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/ParamDataDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/ParamDataDao.java
@@ -19,5 +19,6 @@
public interface ParamDataDao extends BaseDao<ParamData> {
List<ParamData> getList(Map<String, Object> params);
+ ParamData getParamData(Long productId, String pageCode);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
index 7a00033..3c327f3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
@@ -29,4 +29,5 @@
List<ProductImg> getProduct(Long productId);
List<XhProductModel> getTaskProductList();
+ XhProductModel getById(Long id);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java
index 3134636..6e356bc 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java
@@ -1,6 +1,7 @@
package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelNode;
import com.zt.life.modules.mainPart.taskReliability.model.ModelNodeAlgorithm;
import org.apache.ibatis.annotations.Mapper;
@@ -18,6 +19,7 @@
public interface ModelNodeAlgorithmDao extends BaseDao<ModelNodeAlgorithm> {
List<ModelNodeAlgorithm> getList(Map<String, Object> params);
+ List<ModelNode> getListByModelId(Long modelId);
void deleteByModelId(Long modelId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java
index fdbe55c..859ba83 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java
@@ -20,5 +20,6 @@
List<ModelRbd> getList(Map<String, Object> params);
ModelRbd getDiagram(Long modelId);
+ ModelRbd getDiagramOfXDY(Long productId);
void deleteByModelId(Long modelId);
}
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 0cf4c28..85450d9 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
@@ -5,26 +5,22 @@
import com.zt.common.service.BaseService;
import com.zt.common.utils.JsonUtils2;
import com.zt.common.utils.UUIDUtil;
+import com.zt.life.modules.mainPart.basicInfo.dao.ParamDataDao;
+import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
+import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
+import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
import com.zt.life.modules.mainPart.taskReliability.dto.ModelLinePair;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import org.apache.commons.lang3.StringUtils;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Document;
+import org.dom4j.Element;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import org.springframework.transaction.annotation.Transactional;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.StringWriter;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,6 +43,10 @@
private AlgorithmDao algorithmDao;
@Autowired
private ModelNodeAlgorithmDao modelNodeAlgorithmDao;
+ @Autowired
+ private XhProductModelDao xhProductModelDao;
+ @Autowired
+ private ParamDataDao paramDataDao;
/**
* 鍒嗛〉鏌ヨ
@@ -117,7 +117,7 @@
List<ModelNode> modelNodeList = new ArrayList<>();
List<ModelLine> modelLineList = new ArrayList<>();
List<Algorithm> algorithmList = new ArrayList<>();
- List<ProductImg> productImgList = new ArrayList<>();
+ List<ProductImg> productImgList = new ArrayList<>(); // 鏆備笉浣跨敤锛堣�屼娇鐢ㄦ暟鎹簱涓殑鍙潬鎬у弬鏁帮級
// 1. 瑙ｆ瀽鍑鸿妭鐐逛笌杈�
getNodeAndLineFromRbd(modelRbd.getId(), rbdJsonArray, modelNodeList, modelLineList, productImgList);
@@ -127,11 +127,11 @@
List<ModelNode> modelNodeAndVnodeList = modelNodeList.stream().filter(item ->
"node".equals(item.getNodeType())).collect(Collectors.toList());
// 4. 涓嶆柇灏嗗熀鏈ā鍨嬶紙涓茶仈銆佸苟鑱斻�佹梺鑱斻�佽〃鍐炽�佹ˉ鑱旓級鏇挎崲涓鸿櫄鑺傜偣鑰岀畝鍖栧浘褰紝鐩磋嚦鏃犳硶绠�鍖栦负姝€��
- result = getAlgorithmFromRbd(modelRbd, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList, productImgList);
+ result = getAlgorithmFromRbd(modelRbd, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList);
// 5. 杞崲涓虹畻娉曞簱鎺ュ彛XML
if (result) {
- result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList, productImgList);
+// result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList);
}
// 6. 淇濆瓨妯″瀷
@@ -142,22 +142,41 @@
private boolean createIfXmlFromRbd(ModelRbd modelRbd,
List<Algorithm> algorithmList,
- List<ModelNode> modelNodeAndVnodeList,
- List<ProductImg> productImgList) {
+ List<ModelNode> modelNodeAndVnodeList) {
boolean result = true;
- try {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
- Element rootElement = doc.createElement("DES");
- doc.appendChild(rootElement);
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer transformer = tf.newTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- StringWriter writer = new StringWriter();
- transformer.transform(new DOMSource(doc), new StreamResult(writer));
- String xmlString = writer.getBuffer().toString();
+ try {
+ Document document = DocumentHelper.createDocument();
+ // 娣诲姞root鑺傜偣
+ Element root = document.addElement("DES");
+ root.addAttribute("Name", "A System");
+ // 娣诲姞terminal鑺傜偣鍒皉oot1
+ Element terminal = root.addElement("Node");
+ terminal.addAttribute("Name", "Terminal");
+ terminal.addAttribute("Type", "NODE");
+
+ // 灏嗘ā鍨嬭浆鎹负DOM锛屾坊鍔犲埌root
+ 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);
+ node2DOM(algorithmList, modelNodeAndVnodeList, computerNode, root);
+
+ // 娣诲姞start鑺傜偣鍒皉oot
+ Element start = root.addElement("Node");
+ start.addAttribute("Name", "Start");
+ start.addAttribute("Type", "NODE");
+ // 娣诲姞link锛堣矾寰勶級鍒皉oot
+ Element link = root.addElement("Link");
+ Element block = link.addElement("Block");
+ block.addAttribute("Name", "Terminal");
+ block = link.addElement("Block");
+ block.addAttribute("Name", computerNode.getId().toString());
+ block = link.addElement("Block");
+ block.addAttribute("Name", "Start");
+
+ document.setXMLEncoding("UTF-8");
+ String xmlString = document.asXML();
modelRbd.setIfXml(xmlString);
} catch (Exception e) {
e.printStackTrace();
@@ -167,12 +186,82 @@
return result;
}
+ // 閫掑綊鍑芥暟
+ private void node2DOM(List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ ModelNode node,
+ Element parent) {
+ if ("node".equals(node.getNodeType())) {
+ Long dataId = node.getDataId();
+ XhProductModel xhProductModel = xhProductModelDao.getById(dataId);
+ if (xhProductModel == null) return;
+ if ("1".equals(xhProductModel.getProductType())) {
+ // 璁惧
+ ParamData paramData = paramDataDao.getParamData(dataId, "expect");
+ if (paramData == null) return;
+ Element element = parent.addElement("Node");
+ element.addAttribute("Name", dataId.toString());
+ element.addAttribute("Type", "NODE");
+ Element failureTag = element.addElement("Failure");
+ failureTag.addAttribute("Dist", "EXP"); // TODO:闇�璁句负鍏蜂綋鐨勫垎甯�
+ Element argsTag = failureTag.addElement("Args");
+ Double value = new Double(paramData.getTaskMtbcfRegulate());
+ value = 1.0/value;
+ argsTag.addAttribute("value", value.toString());
+ if (1==paramData.getRepairable()) {
+ Element repairTag = element.addElement("Repair");
+ repairTag.addAttribute("Dist", "EXP"); // TODO:闇�璁句负鍏蜂綋鐨勫垎甯�
+ argsTag = repairTag.addElement("Args");
+ value = new Double(paramData.getRepairMttcr());
+ value = 1.0/value;
+ argsTag.addAttribute("value", value.toString());
+ Element repairTimeLimitTag = element.addElement("RepairTimeLimit");
+ repairTimeLimitTag.setText(paramData.getRepairMttcr());
+ }
+ } else if ("10".equals(xhProductModel.getProductType())) {
+ // 铏氬崟浣�
+ ModelRbd rbdXDY = modelRbdDao.getDiagramOfXDY(dataId);
+ if (rbdXDY == null) return;
+ List<Algorithm> algorithmListXDY = algorithmDao.getListByModelId(rbdXDY.getId());
+ List<ModelNode> modelNodeAndVnodeListXDY =modelNodeAlgorithmDao.getListByModelId(rbdXDY.getId());
+ Algorithm endAlgo = algorithmListXDY.stream().filter(item ->
+ "end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
+ ModelNode computerNode = modelNodeAndVnodeListXDY.stream().filter(item ->
+ endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ node2DOM(algorithmListXDY, modelNodeAndVnodeListXDY, computerNode, parent);
+ }
+ } else {
+ // vnode锛堣繍绠楄妭鐐癸級
+ Algorithm algo = algorithmList.stream().filter(item ->
+ node.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ Element element = parent.addElement("Logic");
+ element.addAttribute("Name", algo.getId().toString());
+ if ("series".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "SERIES");
+ } else if ("parallel".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "PARALLEL");
+ } else if ("vote".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "VOTE");
+ element.addAttribute("VoteValue", algo.getVoteNum().toString());
+ } else if ("switch".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "STANDBY");
+ } else if ("bridge".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "BRIDGE");
+ }
+ String[] computerNodeListStr = algo.getComputerList().split(",");
+ for (String nodeStr : computerNodeListStr) {
+ ModelNode nd = modelNodeAndVnodeList.stream().filter(item ->
+ nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ node2DOM(algorithmList, modelNodeAndVnodeList, nd, element);
+ }
+ }
+ }
+
private boolean getAlgorithmFromRbd(ModelRbd modelRbd,
List<ModelNode> modelNodeList,
List<ModelLine> modelLineList,
List<Algorithm> algorithmList,
- List<ModelNode> modelNodeAndVnodeList,
- List<ProductImg> productImgList) {
+ List<ModelNode> modelNodeAndVnodeList) {
// 鏍规嵁浠ヤ笅鐨勬瀯鍥捐鍒欐潵杩涜绠楁硶鍒嗚В锛�
// 1銆佽妭鐐圭殑瀹氫箟
// 1-1) 杩愮畻鑺傜偣锛氬叡2涓細鏃佽仈銆佽〃鍐筹紝涓旇繍绠楄妭鐐归渶鏀惧湪琚繍绠楄妭鐐圭殑鍙充晶銆�
@@ -997,23 +1086,27 @@
modelNode.setName(name==null ? "" : name.toString());
productImg.setDataId(dataId);
- Object obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
- if (obj!=null && StringUtils.isNotBlank(obj.toString())) {
- productImg.setReliabDistribType(Integer.valueOf(obj.toString()));
- }
- productImg.setTaskMtbcf(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcf".split("/")).toString());
- productImg.setTaskMtbcfOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcfOther".split("/")).toString());
- obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/isRepair".split("/"));
- if (obj!=null && StringUtils.isNotBlank(obj.toString())) {
- productImg.setIsRepair(Integer.valueOf(obj.toString()));
- }
- if (1==productImg.getIsRepair()) {
- obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairDistribType".split("/"));
- if (obj!=null && StringUtils.isNotBlank(obj.toString())) {
- productImg.setRepairDistribType(Integer.valueOf(obj.toString()));
+ String productType = JsonUtils2.getJsonValueByPath(jsonObject, "data/productType".split("/")).toString();
+ productImg.setProductType(productType);
+ if ("product_sb".equals(productType)) {
+ Object obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
+ if (obj != null && StringUtils.isNotBlank(obj.toString())) {
+ productImg.setReliabDistribType(Integer.valueOf(obj.toString()));
}
- productImg.setRepairMttcr(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcr".split("/")).toString());
- productImg.setRepairMttcrOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcrOther".split("/")).toString());
+ productImg.setTaskMtbcf(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcf".split("/")).toString());
+ productImg.setTaskMtbcfOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcfOther".split("/")).toString());
+ obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/isRepair".split("/"));
+ if (obj != null && StringUtils.isNotBlank(obj.toString())) {
+ productImg.setIsRepair(Integer.valueOf(obj.toString()));
+ }
+ if (1 == productImg.getIsRepair()) {
+ obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairDistribType".split("/"));
+ if (obj != null && StringUtils.isNotBlank(obj.toString())) {
+ productImg.setRepairDistribType(Integer.valueOf(obj.toString()));
+ }
+ productImg.setRepairMttcr(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcr".split("/")).toString());
+ productImg.setRepairMttcrOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcrOther".split("/")).toString());
+ }
}
productImgList.add(productImg);
}
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
index 7c7b542..2d9c7b9 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
@@ -30,5 +30,16 @@
ORDER BY ${orderBySql}
</if>
</select>
+ <select id="getParamData" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
+ SELECT
+ a.*
+ FROM
+ param_data a
+ WHERE
+ a.is_delete = 0
+ and a.product_id=#{productId}
+ and a.page_code=#{pageCode}
+ limit 1
+ </select>
</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 2a83753..31fa950 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -71,4 +71,11 @@
where a.is_delete = 0
and a.product_type = 4
</select>
+ <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+ select a.*
+ from product_model a
+ where a.is_delete = 0
+ and a.id = #{id}
+ </select>
+
</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
index 0b0c486..922f01b 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
@@ -6,7 +6,9 @@
<select id="getListByModelId" resultType="com.zt.life.modules.mainPart.taskReliability.model.Algorithm">
select a.*
from algorithm a
- where model_id=#{modelId}
+ where
+ a.is_delete = 0
+ and model_id=#{modelId}
order by step
</select>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
index 594897a..6dc4b80 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
@@ -16,6 +16,13 @@
ORDER BY ${orderBySql}
</if>
</select>
+ <select id="getListByModelId" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNode">
+ select a.*
+ from model_node_algorithm a
+ where
+ a.is_delete = 0
+ and model_id=#{modelId}
+ </select>
<update id="deleteByModelId">
delete from model_node_algorithm where model_id=#{modelId}
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
index 8249030..0a8ac08 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
@@ -20,7 +20,9 @@
<select id="getListByModelId" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNode">
select a.*
from model_node a
- where model_id=#{modelId}
+ where
+ a.is_delete = 0
+ and model_id=#{modelId}
</select>
<update id="deleteByModelId">
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
index 1225051..a3212db 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -31,6 +31,15 @@
</where>
limit 1
</select>
+ <select id="getDiagramOfXDY" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+ select a.*
+ from model_rbd a
+ <where>
+ a.is_delete = 0
+ and a.product_id =${productId}
+ </where>
+ limit 1
+ </select>
<update id="deleteByModelId">
delete
--
Gitblit v1.9.1