返回设备高度

linwei

2026-01-31 779853ab6e4564e4d49d2f2a5a2c74d62da97be0

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml

@@ -3,53 +3,39 @@
<mapper namespace="org.sxkj.gd.workorder.mapper.GdManageDeviceMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdManageDeviceResultMap" type="org.sxkj.gd.workorder.entity.GdManageDeviceEntity">
    <resultMap id="gdManageDeviceResultMap" type="org.sxkj.gd.workorder.vo.GdManageDeviceVO">
        <result column="id" property="id"/>
        <result column="device_sn" property="deviceSn"/>
        <result column="device_name" property="deviceName"/>
        <result column="nickname" property="nickname"/>
        <result column="device_type" property="deviceType"/>
        <result column="device_payload" property="devicePayload"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="firmware_version" property="firmwareVersion"/>
        <result column="child_sn" property="childSn"/>
         <result column="mode_code" property="modeCode"/>
        <result column="insure_expired_time" property="insureExpiredTime"/>
        <result column="traffic_remaining" property="trafficRemaining"/>
        <result column="traffic_expire_time" property="trafficExpireTime"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="device_dept_name" property="deviceDeptName"/>
    </resultMap>


    <select id="selectGdManageDevicePage" resultMap="gdManageDeviceResultMap">
        select
            id,
            device_sn,
            device_name,
            nickname,
            device_payload,
            longitude,
            latitude,
            location
            md.*,
            bd.dept_name as device_dept_name
        from
            ja_gd_manage_device
            ja_gd_manage_device md
        left join
                blade_dept bd on md.create_dept = bd.id
        <where>
            <if test="deviceName != null and deviceName != ''">
                and device_name like concat('%',#{deviceName},'%')
                and md.is_deleted = 0
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and md.nickname like concat('%',#{param2.deviceName},'%')
            </if>
            <if test="nickname != null and nickname != ''">
                and nickname like concat('%',#{nickname},'%')
            <if test="param2.deptId != null">
                and md.create_dept = #{param2.deptId}
            </if>
            <if test="deptId != null">
                and create_dept = #{deptId}
            <if test="param2.location != null and param2.location != ''">
                and md.location like concat('%',#{param2.location},'%')
            </if>
            <if test="location != null and location != ''">
                and location like concat('%',#{location},'%')
            </if>
                and is_deleted = 0
        </where>
    </select>

@@ -63,16 +49,18 @@

    <select id="selectGdManageDevice" resultType="org.sxkj.gd.workorder.vo.GdManageDeviceVO">
        select
            id,
            device_sn,
            device_name,
            nickname,
            device_payload,
            longitude,
            latitude,
            geom
            d.id,
            d.device_sn,
            d.device_name,
            d.nickname,
            d.device_payload,
            d.longitude,
            d.latitude,
            d.geom,
            d2.height as height
        from
            ja_gd_manage_device
            ja_gd_manage_device d
        left join ja_gd_manage_device d2 on d.device_sn = d2.device_sn and d2.device_type = '0'
        <where>
            <if test="deviceIds != null and deviceIds.size() > 0">
                and id in
@@ -88,10 +76,6 @@
            </if>
                and is_deleted = 0
        </where>


                <if test="isDeleted != null">
                and is_deleted = #{isDeleted}
            </if></select>
    </select>

</mapper>