From 7a268ed852ca462347cca383a6d0306ff54e1363 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 十一月 2024 15:05:21 +0800
Subject: [PATCH] 添加模版
---
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index 592af80..cb73e83 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -18,9 +18,12 @@
d.collect_url,
d.storage_url,
d.ip,
+ d.entrust_code,
+ d.sample_code,
+ d.db_file_name,
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,
+ ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,
TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(ip.sample, '[["', ''), '"]]', 1)) sample,
ddc.formula,
ddc.referx,
@@ -28,15 +31,15 @@
ddc.x,
ddc.y,
ddc.id,
- ip.id structureItemParameterId
+ ip.id structureItemParameterId
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 ddc.structure_item_parameter_id = ip.id
where d.id = #{deviceId}
</select>
- <select id="deleteDataConfig" resultType="com.yuanchu.mom.pojo.DataConfig">
- SELECT ddc.*
+ <select id="deleteDataConfig" resultType="integer">
+ SELECT ddc.id
FROM device d
left join structure_item_parameter ip on not FIND_IN_SET(ip.id, d.ins_product_ids)
inner join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
--
Gitblit v1.9.3