吉安感知网项目-后端
linwei
2026-01-23 56867ccbb0420214299e822e0668bb6ace89ac63
导出优化
3 files modified
41 ■■■■■ changed files
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml 37 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/param/FwDroneAlarmRecordExportParam.java 2 ●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/param/FwDroneFlightRecordExportParam.java 2 ●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -61,19 +61,30 @@
    <select id="exportFwDroneFlightRecord" resultType="org.sxkj.fw.record.excel.FwDroneFlightRecordExcel">
        SELECT dfr.id,
               dfr.drone_name,
               dfr.serial_no,
               dfr.alarm_time,
               dfr.area_name,
               dfr.trigger_type,
               dfr.stay_duration,
               dfrd.longitude,
               dfrd.latitude,
               dfrd.point_time
        FROM ja_fw_drone_flight_record dfr
                 left join ja_fw_drone_flight_record_detail dfrd on dfr.id = dfrd.flight_record_id
        where dfr.is_deleted = 0
        SELECT
           dfr.id,
           dfr.drone_name,
           dfr.serial_no,
           dfr.alarm_time,
           dfr.area_name,
           dfr.trigger_type,
           dfr.stay_duration,
           dfrd.longitude,
           dfrd.latitude,
           dfrd.point_time
        FROM
            ja_fw_drone_flight_record dfr
        left join
            ja_fw_drone_flight_record_detail dfrd on dfr.id = dfrd.flight_record_id
        <where>
            dfr.is_deleted = 0
            <if test="ids != null and ids.size() > 0">
                and dfr.id in
                <foreach item="item" collection="ids" separator="," open="(" close=")">
                    #{item}
                </foreach>
            </if>
        </where>
    </select>
</mapper>
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/param/FwDroneAlarmRecordExportParam.java
@@ -8,5 +8,5 @@
@Data
public class FwDroneAlarmRecordExportParam {
    @ApiModelProperty("主键id,逗号分隔")
    private List<Long> ids;
    private List<String> ids;
}
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/param/FwDroneFlightRecordExportParam.java
@@ -8,5 +8,5 @@
@Data
public class FwDroneFlightRecordExportParam {
    @ApiModelProperty("主键id,逗号分隔")
    private List<Long> ids;
    private List<String> ids;
}