任务调度记录

rain

2026-01-14 3e2a6aa227a994967487416e003d998090a95c05

任务调度记录

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.fw.detection.mapper.FwTaskScheduleMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.entity.FwTaskScheduleEntity">
    <resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.vo.FwTaskScheduleVO">
        <result column="id" property="id"/>
        <result column="device_id" property="deviceId"/>
        <result column="area_divide_id" property="areaDivideId"/>
@@ -24,72 +24,120 @@
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="device_sn" property="deviceSn"/>
        <result column="device_name" property="deviceName"/>
        <result column="device_type" property="deviceType"/>
        <result column="device_longitude" property="deviceLongitude"/>
        <result column="device_latitude" property="deviceLatitude"/>
        <result column="area_name" property="areaName"/>
        <result column="defense_zone_name" property="defenseZoneName"/>
    </resultMap>


    <select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
        select * from ja_fw_task_schedule
        select
        ts.id,
        ts.device_id,
        ts.area_divide_id,
        ts.defense_scene_id,
        ts.longitude,
        ts.latitude,
        ts.dispatch_user,
        ts.dispatch_start_time,
        ts.dispatch_end_time,
        ts.dispatch_content,
        ts.dispatch_result,
        ts.dispose_measure,
        ts.area_code,
        ts.create_user,
        ts.create_dept,
        ts.create_time,
        ts.update_user,
        ts.update_time,
        ts.is_deleted,
        d.device_sn,
        d.device_name,
        d.device_type,
        d.status as status,
        ad.longitude as device_longitude,
        ad.latitude as device_latitude,
        ad.area_name,
        dz.zone_name as defense_zone_name
        from ja_fw_task_schedule ts
        left join ja_fw_device d on d.id = ts.device_id and d.is_deleted = 0
        left join ja_fw_area_divide ad on ad.id = ts.area_divide_id and ad.is_deleted = 0
        left join ja_fw_defense_scene ds on ds.id = ts.defense_scene_id and ds.is_deleted = 0
        left join ja_fw_defense_zone dz on dz.is_deleted = 0
            and dz.defense_scene_ids is not null
            and dz.defense_scene_ids != ''
            and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
        <where>
            is_deleted = 0
            ts.is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
                and ts.id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
                and ts.device_id = #{param2.deviceId}
            </if>
            <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
                and area_divide_id = #{param2.areaDivideId}
                and ts.area_divide_id = #{param2.areaDivideId}
            </if>
            <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
                and defense_scene_id = #{param2.defenseSceneId}
                and ts.defense_scene_id = #{param2.defenseSceneId}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and longitude = #{param2.longitude}
                and ts.longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and latitude = #{param2.latitude}
                and ts.latitude = #{param2.latitude}
            </if>
            <if test="param2.dispatchUser != null and param2.dispatchUser != ''">
                and dispatch_user = #{param2.dispatchUser}
                and ts.dispatch_user = #{param2.dispatchUser}
            </if>
            <if test="param2.dispatchStartTime != null and param2.dispatchStartTime != ''">
                and dispatch_start_time = #{param2.dispatchStartTime}
                and ts.dispatch_start_time = #{param2.dispatchStartTime}
            </if>
            <if test="param2.dispatchEndTime != null and param2.dispatchEndTime != ''">
                and dispatch_end_time = #{param2.dispatchEndTime}
                and ts.dispatch_end_time = #{param2.dispatchEndTime}
            </if>
            <if test="param2.dispatchContent != null and param2.dispatchContent != ''">
                and dispatch_content = #{param2.dispatchContent}
                and ts.dispatch_content = #{param2.dispatchContent}
            </if>
            <if test="param2.dispatchResult != null and param2.dispatchResult != ''">
                and dispatch_result = #{param2.dispatchResult}
                and ts.dispatch_result = #{param2.dispatchResult}
            </if>
            <if test="param2.disposeMeasure != null and param2.disposeMeasure != ''">
                and dispose_measure = #{param2.disposeMeasure}
                and ts.dispose_measure = #{param2.disposeMeasure}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
                and ts.area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
                and ts.create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
                and ts.create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
                and ts.create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
                and ts.update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
                and ts.update_time = #{param2.updateTime}
            </if>
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and d.device_name like concat('%', #{param2.deviceName}, '%')
            </if>
            <if test="param2.deviceSn != null and param2.deviceSn != ''">
                and d.device_sn like concat('%', #{param2.deviceSn}, '%')
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
                and d.status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
                and ts.is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java

@@ -17,7 +17,7 @@
package org.sxkj.fw.detection.vo;

import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
import org.springblade.core.tool.node.INode;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -32,4 +32,40 @@
public class FwTaskScheduleVO extends FwTaskScheduleEntity {
    private static final long serialVersionUID = 1L;

    /**
     * 设备sn
     */
    @ApiModelProperty(value = "设备sn")
    private String deviceSn;
    /**
     * 设备名称
     */
    @ApiModelProperty(value = "设备名称")
    private String deviceName;
    /**
     * 设备类型
     */
    @ApiModelProperty(value = "设备类型")
    private String deviceType;
    /**
     * 设备经度
     */
    @ApiModelProperty(value = "区域经度")
    private String deviceLongitude;
    /**
     * 设备纬度
     */
    @ApiModelProperty(value = "区域纬度")
    private String deviceLatitude;
    /**
     * 区域名称
     */
    @ApiModelProperty(value = "区域名称")
    private String areaName;
    /**
     * 防区名称
     */
    @ApiModelProperty(value = "防区名称")
    private String defenseZoneName;

}

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

@@ -134,6 +134,16 @@
    @ApiModelProperty(value = "工作模式：侦测中/信号干扰中/诱导驱离中/待机")
    private String workMode;
    /**
     * 纬度
     */
    @ApiModelProperty(value = "纬度")
    private String latitude;
    /**
     * 经度
     */
    @ApiModelProperty(value = "经度")
    private String longitude;
    /**
     * 区域编码
     */
    @ApiModelProperty(value = "区域编码")

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

@@ -23,6 +23,8 @@
        <result column="detect_target_cnt" property="detectTargetCnt"/>
        <result column="effective_range_km" property="effectiveRangeKm"/>
        <result column="work_mode" property="workMode"/>
        <result column="latitude" property="latitude"/>
        <result column="longitude" property="longitude"/>
        <result column="area_code" property="areaCode"/>
        <result column="device_sn" property="deviceSn"/>
        <result column="create_user" property="createUser"/>

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

@@ -142,6 +142,16 @@
    @ApiModelProperty(value = "工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机")
    private String workMode;
    /**
     * 纬度
     */
    @ApiModelProperty(value = "纬度")
    private String latitude;
    /**
     * 经度
     */
    @ApiModelProperty(value = "经度")
    private String longitude;
    /**
     * 设备sn
     */
    @ApiModelProperty(value = "设备sn")