From 54bae7fcc7a2dca32b7614b698c52399b2920b4f Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 24 三月 2025 13:35:47 +0800 Subject: [PATCH] 近场/远场辐射导入样式修改 --- cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 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..cb73e83 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,36 @@ <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, + 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, + TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(ip.sample, '[["', ''), '"]]', 1)) sample, + ddc.formula, + ddc.referx, + ddc.refery, + ddc.x, + ddc.y, + ddc.id, + 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="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 + </select> </mapper> -- Gitblit v1.9.3