Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 c04afebf9cebfd65bf55c2395e732f36f558d208

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml

@@ -81,6 +81,12 @@
            <if test="param2.status != null">
                and status = #{param2.status}
            </if>
            <if test="param2.isTrack != null and param2.isTrack == 1">
                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
            </if>
            <if test="param2.isTrack != null and param2.isTrack == 2">
                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
            </if>
        </where>
    </select>

@@ -126,6 +132,12 @@
            </if>
            <if test="status != null">
                and status = #{status}
            </if>
            <if test="isTrack != null and isTrack == 1">
                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
            </if>
            <if test="isTrack != null and isTrack == 2">
                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
            </if>
        </where>
    </select>
@@ -225,6 +237,13 @@
        WHERE
            d.is_deleted = 0
          AND t.out_target IS NOT NULL
        <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 1">
            and d.effective_range_km is not null
            and d.effective_range_km > 0
        </if>
        <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 2">
            and (d.effective_range_km is null or d.effective_range_km = 0)
        </if>
        GROUP BY
            t.out_target;
    </select>