数据驾驶舱优化

linwei

2026-01-09 f5fce538501500b45238ef637b57fe00f73ecb7f

数据驾驶舱优化

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

@@ -20,6 +20,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * 设备表 数据传输对象实体类
@@ -95,6 +96,6 @@
     * 设备状态，多个状态用逗号隔
     */
    @ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
    private String deviceStatus;
    private List<String> deviceStatusList;

}

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

@@ -62,6 +62,12 @@
            <if test="param2.belongDept != null and param2.belongDept != ''">
                and belong_dept = #{param2.belongDept}
            </if>
            <if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
                and status in
                <foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
                    #{item}
                </foreach>
            </if>
        </where>
    </select>


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

@@ -136,6 +136,12 @@
    @ApiModelProperty(value = "有效范围 km")
    private BigDecimal effectiveRangeKm;

    /**
     * 工作模式：侦测中/信号干扰中/诱导驱离中/待机
     */
    @ApiModelProperty(value = "工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机")
    private String workMode;

    @ApiModelProperty(value = "所属部门名称")
    public String getBelongDeptName() {
        if (belongDept == null) {

 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.fw.record.controller;

import com.github.xiaoymin.knife4j.annotations.Ignore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -142,6 +143,7 @@
     */
    @GetMapping("/export-fwDroneFlightRecordDetail")
    @ApiOperationSupport(order = 9)
    @Ignore
    @ApiOperation(value = "导出数据", notes = "传入fwDroneFlightRecordDetail")
    public void exportFwDroneFlightRecordDetail(@ApiIgnore @RequestParam Map<String, Object> fwDroneFlightRecordDetail, BladeUser bladeUser, HttpServletResponse response) {
        QueryWrapper<FwDroneFlightRecordDetailEntity> queryWrapper = Condition.getQueryWrapper(fwDroneFlightRecordDetail, FwDroneFlightRecordDetailEntity.class);