From fb72fd1f35643f6fa4911073d97506c9f9b76d36 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Fri, 18 Apr 2025 13:07:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E5=8D=95=E9=87=8C=E7=94=B5=E7=BC=86=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E9=83=BD=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/mapping/BusiEqmWarningMapping.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml index 11060d2..441bdfe 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml @@ -72,21 +72,21 @@ t.sensor_manufactor, t.sensor_name, --> CONCAT_WS('', t_sensor.sensor_name, g_sensor.sensor_name,ge_sensor.sensor_name, a_sensor.sensor_name, o_sensor.sensor_name, - p_sensor.sensor_name) AS sensorName, + p_sensor.sensor_name, cab_sensor.sensor_name) AS sensorName, CONCAT_WS('', t_sensor.sensor_brand, g_sensor.sensor_brand,ge_sensor.sensor_brand, a_sensor.sensor_brand, o_sensor.sensor_brand, - p_sensor.sensor_brand) AS sensorBrand, + p_sensor.sensor_brand, cab_sensor.sensor_brand) AS sensorBrand, CONCAT_WS('', t_sensor.manufactor, g_sensor.manufactor,ge_sensor.manufactor, a_sensor.manufactor, o_sensor.manufactor, - p_sensor.manufactor) AS sensorManufactor, + p_sensor.manufactor, cab_sensor.manufactor) AS sensorManufactor, CONCAT_WS('', t_sensor.position_des, g_sensor.position_des,ge_sensor.position_des, a_sensor.position_des, o_sensor.position_des, - p_sensor.position_des) AS sensorInstallLocation, - CONCAT_WS('', t_sensor.use_date, g_sensor.use_date,ge_sensor.use_date, a_sensor.use_date, o_sensor.use_date, p_sensor.use_date) AS - sensorUseDate, - CONCAT_WS('',t_sensor.position,g_sensor.position,ge_sensor.position,a_sensor.position,o_sensor.position,p_sensor.position) AS - sensorPosition, + p_sensor.position_des, cab_sensor.position_des) AS sensorInstallLocation, + CONCAT_WS('', t_sensor.use_date, g_sensor.use_date,ge_sensor.use_date, a_sensor.use_date, o_sensor.use_date, p_sensor.use_date, + cab_sensor.use_date) AS sensorUseDate, + CONCAT_WS('',t_sensor.position,g_sensor.position,ge_sensor.position,a_sensor.position,o_sensor.position,p_sensor.position, + cab_sensor.position) AS sensorPosition, t.run_state as runState, bst.name AS mainEquipmentName, - CONCAT_WS('',transformer_sub.equipment_type,gis_sub.equipment_type,gen_sub.equipment_type,arrester_sub.equipment_type,other_sub.equipment_type) - as subEquipmentType + CONCAT_WS('',transformer_sub.equipment_type,gis_sub.equipment_type,gen_sub.equipment_type,arrester_sub.equipment_type,other_sub.equipment_type, + cab_sensor.equipment_type) as subEquipmentType