反无设备查询返回场景，区域id

linwei

2026-02-04 c44fc65e2a402728288e978bb7c25068d507b75c

反无设备查询返回场景，区域id

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java

@@ -40,6 +40,7 @@
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
@@ -239,5 +240,12 @@
        List<FwDeviceExcel> list = fwDeviceService.exportFwDevice(queryWrapper);
        ExcelUtil.export(response, "设备表数据" + DateUtil.time(), "设备表数据表", list, FwDeviceExcel.class);
    }

    // 任务调度使用
    @GetMapping("/listByTask")
    @ApiOperationSupport(order = 10)
    @ApiOperation(value = "任务调度使用")
    public R<IPage<CockpitFwDeviceVO>> listByTask(FwDeviceDTO fwDevice, Query query) {
        IPage<CockpitFwDeviceVO> pages = fwDeviceService.selectCockpitDevicePage(Condition.getPage(query), fwDevice);
         return R.data(pages);
    }
}

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

@@ -516,12 +516,23 @@

    <select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
        select
            d.*
            d.*,
            min(ad.id) as area_divide_id,
            min(dsm.id) as defense_scene_manage_id
        from
            ja_fw_device d
        left join ja_fw_area_divide ad
            on find_in_set(d.id, ad.device_ids) > 0
            and ad.is_deleted = 0
        left join ja_fw_defense_scene ds
            on find_in_set(ad.id, ds.area_divide_ids) > 0
            and ds.is_deleted = 0
        left join ja_fw_defense_scene_manage dsm
            on dsm.defense_scene_id = ds.id
            and dsm.is_deleted = 0
        <where>
            d.is_deleted = 0
            and d.is_enabled = 1
                d.is_deleted = 0
                and d.is_enabled = 1
            <if test="param2.regionCode != null and param2.regionCode != ''">
                and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
                <!-- 或者设备是共享给当前部门的 -->
@@ -580,6 +591,7 @@
                </foreach>
            </if>
        </where>
            group by d.id
    </select>

    <update id="updateTrackStatusByDeviceId">

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java

@@ -175,4 +175,11 @@
     */
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;


    @ApiModelProperty(value = "区域id")
    private Long areaDivideId;

    @ApiModelProperty(value = "场景管理id")
    private Long defenseSceneManageId;
}