From 0f9b18e68ab00401a5821942788b94baff30eef9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 14 三月 2024 07:50:52 +0800
Subject: [PATCH] 优化RBD识别算法：串联、旁联、表决的节点顺序
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 46684f6..94f638d 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -34,28 +34,42 @@
and pid is null
</if>
</where>
- Group by node_type
+ Group by product_type
</select>
<select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.name, a.id
from product_model a
where a.is_delete = 0
- and a.node_type = 5
+ and a.product_type = 5
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
- SELECT a.operational_status as imgPath,
- a.`NAME` as imgName,
- 'node' as nodeType,
- '' as nodeTypeExt,
- 60 as imgWidth,
- 60 as imgHeight,
- a.id as dataId,
- '' as statusImg,
- d.dict_code as productType
+ SELECT a.default_img as imgPath,
+ a.`NAME` as imgName,
+ 'node' as nodeType,
+ '' as nodeTypeExt,
+ s.width as imgWidth,
+ s.height as imgHeight,
+ a.id as dataId,
+ '' as statusImg,
+ d.dict_code as productType,
+ p.task_mtbcf_accept as taskMtbcf,
+ p.task_mtbcf_other_params as taskMtbcfOther,
+ p.reliab_distrib_type as reliabDistribType,
+ p.repair_distrib_type as repairDistribType,
+ p.repair_mttcr as RepairMttcr,
+ p.repair_mttcr_other_params as RepairMttcrOther
FROM product_model a
- left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306' --
+ left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306'
+ left join param_data p on p.product_id = a.id and p.page_code = 'expect'
+ left join sys_picture_base s on s.id = a.default_img
WHERE a.is_delete = 0
AND a.PID = ${productId}
</select>
+ <select id="getDefaultImg" resultType="java.lang.String">
+ SELECT a.id
+ FROM sys_picture_base a
+ WHERE a.IS_DELETE = 0
+ AND a.CONTENT_TYPE = '榛樿璁惧'
+ </select>
</mapper>
--
Gitblit v1.9.1