From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index 8730f30..7701b02 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -5,9 +5,6 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.DataConfig">
<id column="id" property="id" />
- <result column="file_type" property="fileType" />
- <result column="collect_url" property="collectUrl" />
- <result column="storage_url" property="storageUrl" />
<result column="formula" property="formula" />
<result column="referx" property="referx" />
<result column="refery" property="refery" />
@@ -15,4 +12,27 @@
<result column="y" property="y" />
</resultMap>
+ <select id="selectDataConfigList" resultType="com.yuanchu.mom.dto.DeviceConfigDtoPage">
+ SELECT d.device_name,
+ d.file_type,
+ d.collect_url,
+ d.storage_url,
+ d.ip,
+ ip.inspection_item,
+ if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
+ ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,
+ ddc.formula,
+ ddc.referx,
+ ddc.refery,
+ ddc.x,
+ ddc.y,
+ ddc.id
+ FROM device d
+ left join structure_item_parameter ip on FIND_IN_SET(ip.id, d.ins_product_ids)
+ left join device_data_config ddc on ddc.device_id = d.id and
+ if(ip.inspection_item_subclass is not null and
+ ip.inspection_item_subclass != '', ip.inspection_item_subclass,
+ ip.inspection_item) = ddc.ins_product_item
+ where d.id = #{deviceId}
+ </select>
</mapper>
--
Gitblit v1.9.3