Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

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

@@ -19,15 +19,7 @@

    <select id="selectGdManageDevicePage" resultMap="gdManageDeviceResultMap">
        select
            md.id,
            md.device_sn,
            md.device_name,
            md.nickname,
            md.mode_code,
            md.device_payload,
            md.longitude,
            md.latitude,
            md.location,
            md.*,
            bd.dept_name as device_dept_name
        from
            ja_gd_manage_device md
@@ -36,10 +28,7 @@
        <where>
                and md.is_deleted = 0
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and md.device_name like concat('%',#{param2.deviceName},'%')
            </if>
            <if test="param2.nickname != null and param2.nickname != ''">
                and md.nickname like concat('%',#{param2.nickname},'%')
                and md.nickname like concat('%',#{param2.deviceName},'%')
            </if>
            <if test="param2.deptId != null">
                and md.create_dept = #{param2.deptId}
@@ -60,30 +49,32 @@

    <select id="selectGdManageDevice" resultType="org.sxkj.gd.workorder.vo.GdManageDeviceVO">
        select
            id,
            device_sn,
            device_name,
            nickname,
            device_payload,
            longitude,
            latitude,
            geom
            md.id,
            md.device_sn,
            md.device_name,
            md.nickname,
            md.device_payload,
            md.longitude,
            md.latitude,
            md.geom,
            d2.height as height
        from
            ja_gd_manage_device
            ja_gd_manage_device md
        left join ja_gd_manage_device d2 on md.device_sn = d2.device_sn and d2.device_type = '0'
        <where>
            <if test="deviceIds != null and deviceIds.size() > 0">
                and id in
                and md.id in
                <foreach item="item" collection="deviceIds" index="index" open="(" close=")" separator=",">
                    #{item}
                </foreach>
            </if>
            <if test="devicePayload != null and devicePayload != ''">
                and device_payload like concat('%',#{devicePayload},'%')
                and md.device_payload like concat('%',#{devicePayload},'%')
            </if>
            <if test="geom != null and geom != ''">
                and ST_Intersects(geom, ST_GeomFromText(#{geom}))
                and ST_Intersects(md.geom, ST_GeomFromText(#{geom}))
            </if>
                and is_deleted = 0
                and md.is_deleted = 0
        </where>
    </select>