Merge remote-tracking branch 'origin/master'

xiebin

2026-01-12 b1f7d9f1c9a23c2e360d93d1ee60e03cc94a78d2

Merge remote-tracking branch 'origin/master'

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java

@@ -19,14 +19,15 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.LocalDateTime;

/**
 * 区域划分表 数据传输对象实体类
@@ -91,25 +92,19 @@
    @ApiModelProperty(value = "关联派出所id")
    private Long policeStationId;
    /**
     * 可飞行时间段-开始
     * 可飞行日期时间-开始
     */
    @ApiModelProperty(value = "可飞行时间段-开始")
    private LocalTime flyTimeStart;
    @ApiModelProperty(value = "可飞行日期时间-开始")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime flyDateStart;
    /**
     * 可飞行时间段-结束
     * 可飞行日期时间-结束
     */
    @ApiModelProperty(value = "可飞行时间段-结束")
    private LocalTime flyTimeEnd;
    /**
     * 可飞行日期-开始
     */
    @ApiModelProperty(value = "可飞行日期-开始")
    private LocalDate flyDateStart;
    /**
     * 可飞行日期-结束
     */
    @ApiModelProperty(value = "可飞行日期-结束")
    private LocalDate flyDateEnd;
    @ApiModelProperty(value = "可飞行日期时间-结束")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime flyDateEnd;
    /**
     * 区域编码
     */

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,8 +26,7 @@
import org.springblade.core.mp.base.BaseEntity;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.LocalDateTime;

/**
 * 区域划分表 实体类
@@ -101,29 +101,19 @@
    @ApiModelProperty(value = "关联派出所id")
    private Long policeStationId;
    /**
     * 可飞行时间段-开始
     */
    @TableField("fly_time_start")
    @ApiModelProperty(value = "可飞行时间段-开始")
    private LocalTime flyTimeStart;
    /**
     * 可飞行时间段-结束
     */
    @TableField("fly_time_end")
    @ApiModelProperty(value = "可飞行时间段-结束")
    private LocalTime flyTimeEnd;
    /**
     * 可飞行日期-开始
     * 可飞行日期时间-开始
     */
    @TableField("fly_date_start")
    @ApiModelProperty(value = "可飞行日期-开始")
    private LocalDate flyDateStart;
    @ApiModelProperty(value = "可飞行日期时间-开始")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime flyDateStart;
    /**
     * 可飞行日期-结束
     * 可飞行日期时间-结束
     */
    @TableField("fly_date_end")
    @ApiModelProperty(value = "可飞行日期-结束")
    private LocalDate flyDateEnd;
    @ApiModelProperty(value = "可飞行日期时间-结束")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime flyDateEnd;
    /**
     * 区域编码
     */

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java

@@ -22,12 +22,11 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import org.sxkj.fw.utils.excel.LocalTimeConverter;
import org.sxkj.fw.utils.excel.LocalDateTimeConverter;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.LocalDateTime;


/**
@@ -105,29 +104,17 @@
    @ExcelProperty("关联派出所id")
    private Long policeStationId;
    /**
     * 可飞行时间段-开始
     * 可飞行日期时间-开始
     */
    @ColumnWidth(20)
    @ExcelProperty(value = "可飞行时间段-开始", converter = LocalTimeConverter.class)
    private LocalTime flyTimeStart;
    @ExcelProperty(value = "可飞行日期时间-开始", converter = LocalDateTimeConverter.class)
    private LocalDateTime flyDateStart;
    /**
     * 可飞行时间段-结束
     * 可飞行日期时间-结束
     */
    @ColumnWidth(20)
    @ExcelProperty(value = "可飞行时间段-结束", converter = LocalTimeConverter.class)
    private LocalTime flyTimeEnd;
    /**
     * 可飞行日期-开始
     */
    @ColumnWidth(20)
    @ExcelProperty("可飞行日期-开始")
    private LocalDate flyDateStart;
    /**
     * 可飞行日期-结束
     */
    @ColumnWidth(20)
    @ExcelProperty("可飞行日期-结束")
    private LocalDate flyDateEnd;
    @ExcelProperty(value = "可飞行日期时间-结束", converter = LocalDateTimeConverter.class)
    private LocalDateTime flyDateEnd;
    /**
     * 区域编码
     */

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml

@@ -15,8 +15,6 @@
        <result column="response_mechanism" property="responseMechanism"/>
        <result column="control_level" property="controlLevel"/>
        <result column="police_station_id" property="policeStationId"/>
        <result column="fly_time_start" property="flyTimeStart"/>
        <result column="fly_time_end" property="flyTimeEnd"/>
        <result column="fly_date_start" property="flyDateStart"/>
        <result column="fly_date_end" property="flyDateEnd"/>
        <result column="area_code" property="areaCode"/>
@@ -46,8 +44,6 @@
        ad.response_mechanism,
        ad.control_level,
        ad.police_station_id,
        ad.fly_time_start,
        ad.fly_time_end,
        ad.fly_date_start,
        ad.fly_date_end,
        ad.area_code,
@@ -104,12 +100,6 @@
            <if test="param2.policeStationId != null and param2.policeStationId != ''">
                and ad.police_station_id = #{param2.policeStationId}
            </if>
            <if test="param2.flyTimeStart != null and param2.flyTimeStart != ''">
                and ad.fly_time_start &gt;= #{param2.flyTimeStart}
            </if>
            <if test="param2.flyTimeEnd != null and param2.flyTimeEnd != ''">
                and ad.fly_time_end &lt;= #{param2.flyTimeEnd}
            </if>
            <if test="param2.flyDateStart != null and param2.flyDateStart != ''">
                and ad.fly_date_start &gt;= #{param2.flyDateStart}
            </if>
@@ -135,8 +125,6 @@
        ad.response_mechanism,
        ad.control_level,
        ad.police_station_id,
        ad.fly_time_start,
        ad.fly_time_end,
        ad.fly_date_start,
        ad.fly_date_end,
        ad.area_code,
@@ -170,8 +158,6 @@
        response_mechanism,
        control_level,
        police_station_id,
        fly_time_start,
        fly_time_end,
        fly_date_start,
        fly_date_end,
        area_code,
@@ -198,8 +184,6 @@
            response_mechanism,
            control_level,
            police_station_id,
            fly_time_start,
            fly_time_end,
            fly_date_start,
            fly_date_end,
            area_code,
@@ -232,8 +216,6 @@
            #{responseMechanism},
            #{controlLevel},
            #{policeStationId},
            #{flyTimeStart},
            #{flyTimeEnd},
            #{flyDateStart},
            #{flyDateEnd},
            #{areaCode},
@@ -267,8 +249,6 @@
            <if test="responseMechanism != null">response_mechanism = #{responseMechanism},</if>
            <if test="controlLevel != null">control_level = #{controlLevel},</if>
            <if test="policeStationId != null">police_station_id = #{policeStationId},</if>
            <if test="flyTimeStart != null">fly_time_start = #{flyTimeStart},</if>
            <if test="flyTimeEnd != null">fly_time_end = #{flyTimeEnd},</if>
            <if test="flyDateStart != null">fly_date_start = #{flyDateStart},</if>
            <if test="flyDateEnd != null">fly_date_end = #{flyDateEnd},</if>
            <if test="areaCode != null">area_code = #{areaCode},</if>