diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index 3754c2b9..a633c27b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -133,34 +133,15 @@ -- nu_id as nuId, -- a.channel -- from nu_iot_tplink_camera a - select a.id, - a.device_index as deviceIndex, - b.device_name as deviceName, - b.device_type as deviceType, - a.device_status as deviceStatus, - b.device_model as deviceModel, - a.ip as ip, - a.mac as mac, - a.region_id as regionId, - a.region_name as regionName, - a.parent_id as parentId, - a.parent_device_name as parentDeviceName, - a.project_id as projectId, - a.project_name as projectName, - a.firmware_ver as firmwareVer, - a.hardware_ver as hardwareVer, - a.manager_auth_type as managerAuthType, - a.msg_auth_type as msgAuthType, - a.sip_code as sipCode, - a.location_name as locationName, - a.system_type as systemType, - a.protocol as protocol, - a.record_plan_id as recordPlanId, - b.nu_id as nuId, - a.channel - from nu_iot_tplink_camera a - inner join nu_iot_device_preview b on a.mac = b.sn - where b.device_status != '损坏' + select a.*, + b.device_name as deviceName, + b.device_type as deviceType, + a.device_status as deviceStatus, + b.device_model as deviceModel, + b.nu_id as nuId + from nu_iot_tplink_camera a + inner join nu_iot_device_preview b on a.mac = b.sn + where b.device_status != '损坏'