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