设备列表返回状态相关及支持筛选

rain

2026-01-16 4db3d98e63dfb29173b5159d150b2936367e59da

设备列表返回状态相关及支持筛选

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

@@ -88,10 +88,11 @@
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "列表", notes = "传入isAreaSelect和区域id")
    @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
    public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
                                    @RequestParam(value = "areaId", required = false) Long areaId) {
        List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId);
                                    @RequestParam(value = "areaId", required = false) Long areaId,
                                    @RequestParam(value = "status", required = false) Integer status) {
        List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status);
        FwDeviceWrapper wrapper = FwDeviceWrapper.build();
        return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
    }

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java

@@ -112,4 +112,10 @@
    @ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
    private List<String> deviceStatusList;

    /**
     * 运行状态（0:在线/1:离线/2:故障/3:报废）
     */
    @ApiModelProperty(value = "运行状态（0:在线/1:离线/2:故障/3:报废）")
    private Integer status;

}

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

@@ -54,7 +54,8 @@
     * @param areaId
     * @return
     */
    List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId);
    List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
        @Param("status") Integer status);


    /**

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

@@ -78,6 +78,9 @@
                    #{item}
                </foreach>
            </if>
            <if test="param2.status != null">
                and status = #{param2.status}
            </if>
        </where>
    </select>

@@ -121,6 +124,9 @@
                    </choose>
                )
            </if>
            <if test="status != null">
                and status = #{status}
            </if>
        </where>
    </select>


 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java

@@ -34,4 +34,10 @@
     */
    @ApiModelProperty(value = "有效范围是否为空：0-不处理 1-不为空 2-为空")
    private int effectiveRangeKmIsNotNull;

    /**
     * 运行状态（0:在线/1:离线/2:故障/3:报废）
     */
    @ApiModelProperty(value = "运行状态（0:在线/1:离线/2:故障/3:报废）")
    private Integer status;
}

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

@@ -49,11 +49,12 @@
    /**
     * 列表查询
     *
     * @param isAreaSelect
     * @param areaId
     * @param isAreaSelect 是否过滤区域
     * @param areaId 设备被关联区域id
     * @param status 设备状态
     * @return
     */
    List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId);
    List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status);


    /**

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -53,8 +53,8 @@
    }

    @Override
    public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId) {
        return baseMapper.selectFwDeviceList(isAreaSelect, areaId);
    public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status) {
        return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status);
    }