drone-service/drone-fw/src/main/java/README.md
New file @@ -0,0 +1,6 @@ 说明: area: 区域管理 cockpit: 数据驾驶舱 detection:侦测管理 device:设备管理 record:记录管理 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java
@@ -49,7 +49,7 @@ * 防区管理表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java
@@ -49,7 +49,7 @@ * 派出所信息表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseZoneDTO.java
@@ -24,7 +24,7 @@ * 防区管理表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwPoliceStationDTO.java
@@ -24,7 +24,7 @@ * 派出所信息表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
@@ -17,18 +17,21 @@ package org.sxkj.fw.area.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalTime; /** * 区域划分表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_area_divide") @@ -36,5 +39,80 @@ @EqualsAndHashCode(callSuper = true) public class FwAreaDivideEntity extends BaseEntity { /** * 区域名称 */ @ApiModelProperty(value = "区域名称") private String areaName; /** * 区域中心经度 */ @ApiModelProperty(value = "区域中心经度") private Double longitude; /** * 区域中心纬度 */ @ApiModelProperty(value = "区域中心纬度") private Double latitude; /** * 区域面积(km²) */ @ApiModelProperty(value = "区域面积(km²)") private BigDecimal areaSize; /** * 经纬度面(存储地理面数据) */ @ApiModelProperty(value = "经纬度面(存储地理面数据)") private byte[] geom; /** * 区域类型:报警区/重点管制区 */ @ApiModelProperty(value = "区域类型:报警区/重点管制区") private String areaType; /** * 触发条件 */ @ApiModelProperty(value = "触发条件") private String triggerCondition; /** * 响应机制内容 */ @ApiModelProperty(value = "响应机制内容") private String responseMechanism; /** * 管控级别:日常/重点/严密 */ @ApiModelProperty(value = "管控级别:日常/重点/严密") private String controlLevel; /** * 关联派出所id */ @ApiModelProperty(value = "关联派出所id") private Long policeStationId; /** * 可飞行时间段-开始 */ @ApiModelProperty(value = "可飞行时间段-开始") private LocalTime flyTimeStart; /** * 可飞行时间段-结束 */ @ApiModelProperty(value = "可飞行时间段-结束") private LocalTime flyTimeEnd; /** * 可飞行日期-开始 */ @ApiModelProperty(value = "可飞行日期-开始") private LocalDate flyDateStart; /** * 可飞行日期-结束 */ @ApiModelProperty(value = "可飞行日期-结束") private LocalDate flyDateEnd; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseSceneEntity.java
@@ -17,18 +17,17 @@ package org.sxkj.fw.area.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; /** * 防控场景表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_defense_scene") @@ -36,5 +35,60 @@ @EqualsAndHashCode(callSuper = true) public class FwDefenseSceneEntity extends BaseEntity { /** * 场景名称 */ @ApiModelProperty(value = "场景名称") private String sceneName; /** * 场景类型:核心区/学校等 */ @ApiModelProperty(value = "场景类型:核心区/学校等") private String sceneType; /** * 指挥点经度 */ @ApiModelProperty(value = "指挥点经度") private Double longitude; /** * 指挥点纬度 */ @ApiModelProperty(value = "指挥点纬度") private Double latitude; /** * 防控负责人 */ @ApiModelProperty(value = "防控负责人") private String defenseLeader; /** * 防控负责人电话 */ @ApiModelProperty(value = "防控负责人电话") private String leaderPhone; /** * 防控面积(m) */ @ApiModelProperty(value = "防控面积(m)") private Integer defenseArea; /** * 设备模式 */ @ApiModelProperty(value = "设备模式") private String deviceMode; /** * 关联区域ID,逗号分隔 */ @ApiModelProperty(value = "关联区域ID,逗号分隔") private String areaDivideIds; /** * 关联设备ID,逗号分隔 */ @ApiModelProperty(value = "关联设备ID,逗号分隔") private String deviceIds; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseZoneEntity.java
@@ -17,18 +17,19 @@ package org.sxkj.fw.area.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.math.BigDecimal; /** * 防区管理表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_defense_zone") @@ -36,5 +37,40 @@ @EqualsAndHashCode(callSuper = true) public class FwDefenseZoneEntity extends BaseEntity { /** * 防区名称 */ @ApiModelProperty(value = "防区名称") private String zoneName; /** * 防区面积(km²) */ @ApiModelProperty(value = "防区面积(km²)") private BigDecimal zoneArea; /** * 关联场景ID,逗号分隔 */ @ApiModelProperty(value = "关联场景ID,逗号分隔") private String defenseSceneIds; /** * 关联区域ID,逗号分隔 */ @ApiModelProperty(value = "关联区域ID,逗号分隔") private String areaDivideIds; /** * 关联设备ID,逗号分隔 */ @ApiModelProperty(value = "关联设备ID,逗号分隔") private String deviceIds; /** * 经纬度面(存储地理面数据) */ @ApiModelProperty(value = "经纬度面(存储地理面数据)") private byte[] geom; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwPoliceStationEntity.java
@@ -17,18 +17,17 @@ package org.sxkj.fw.area.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; /** * 派出所信息表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_police_station") @@ -36,5 +35,40 @@ @EqualsAndHashCode(callSuper = true) public class FwPoliceStationEntity extends BaseEntity { /** * 派出所名称 */ @ApiModelProperty(value = "派出所名称") private String stationName; /** * 派出所地址 */ @ApiModelProperty(value = "派出所地址") private String address; /** * 经度 */ @ApiModelProperty(value = "经度") private Double longitude; /** * 纬度 */ @ApiModelProperty(value = "纬度") private Double latitude; /** * 联系人 */ @ApiModelProperty(value = "联系人") private String contactPerson; /** * 联系方式 */ @ApiModelProperty(value = "联系方式") private String contactPhone; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java
@@ -17,13 +17,16 @@ package org.sxkj.fw.area.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalTime; /** @@ -40,5 +43,101 @@ private static final long serialVersionUID = 1L; /** * 区域名称 */ @ColumnWidth(20) @ExcelProperty("区域名称") private String areaName; /** * 区域中心经度 */ @ColumnWidth(20) @ExcelProperty("区域中心经度") private Double longitude; /** * 区域中心纬度 */ @ColumnWidth(20) @ExcelProperty("区域中心纬度") private Double latitude; /** * 区域面积(km²) */ @ColumnWidth(20) @ExcelProperty("区域面积(km²)") private BigDecimal areaSize; /** * 经纬度面(存储地理面数据) */ @ColumnWidth(20) @ExcelProperty("经纬度面(存储地理面数据)") private byte[] geom; /** * 区域类型:报警区/重点管制区 */ @ColumnWidth(20) @ExcelProperty("区域类型:报警区/重点管制区") private String areaType; /** * 触发条件 */ @ColumnWidth(20) @ExcelProperty("触发条件") private String triggerCondition; /** * 响应机制内容 */ @ColumnWidth(20) @ExcelProperty("响应机制内容") private String responseMechanism; /** * 管控级别:日常/重点/严密 */ @ColumnWidth(20) @ExcelProperty("管控级别:日常/重点/严密") private String controlLevel; /** * 关联派出所id */ @ColumnWidth(20) @ExcelProperty("关联派出所id") private Long policeStationId; /** * 可飞行时间段-开始 */ @ColumnWidth(20) @ExcelProperty("可飞行时间段-开始") private LocalTime flyTimeStart; /** * 可飞行时间段-结束 */ @ColumnWidth(20) @ExcelProperty("可飞行时间段-结束") private LocalTime flyTimeEnd; /** * 可飞行日期-开始 */ @ColumnWidth(20) @ExcelProperty("可飞行日期-开始") private LocalDate flyDateStart; /** * 可飞行日期-结束 */ @ColumnWidth(20) @ExcelProperty("可飞行日期-结束") private LocalDate flyDateEnd; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwDefenseSceneExcel.java
@@ -17,12 +17,12 @@ package org.sxkj.fw.area.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; @@ -40,5 +40,77 @@ private static final long serialVersionUID = 1L; /** * 场景名称 */ @ColumnWidth(20) @ExcelProperty("场景名称") private String sceneName; /** * 场景类型:核心区/学校等 */ @ColumnWidth(20) @ExcelProperty("场景类型:核心区/学校等") private String sceneType; /** * 指挥点经度 */ @ColumnWidth(20) @ExcelProperty("指挥点经度") private Double longitude; /** * 指挥点纬度 */ @ColumnWidth(20) @ExcelProperty("指挥点纬度") private Double latitude; /** * 防控负责人 */ @ColumnWidth(20) @ExcelProperty("防控负责人") private String defenseLeader; /** * 防控负责人电话 */ @ColumnWidth(20) @ExcelProperty("防控负责人电话") private String leaderPhone; /** * 防控面积(m) */ @ColumnWidth(20) @ExcelProperty("防控面积(m)") private Integer defenseArea; /** * 设备模式 */ @ColumnWidth(20) @ExcelProperty("设备模式") private String deviceMode; /** * 关联区域ID,逗号分隔 */ @ColumnWidth(20) @ExcelProperty("关联区域ID,逗号分隔") private String areaDivideIds; /** * 关联设备ID,逗号分隔 */ @ColumnWidth(20) @ExcelProperty("关联设备ID,逗号分隔") private String deviceIds; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwDefenseZoneExcel.java
@@ -17,20 +17,21 @@ package org.sxkj.fw.area.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; /** * 防区管理表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +41,53 @@ private static final long serialVersionUID = 1L; /** * 防区名称 */ @ColumnWidth(20) @ExcelProperty("防区名称") private String zoneName; /** * 防区面积(km²) */ @ColumnWidth(20) @ExcelProperty("防区面积(km²)") private BigDecimal zoneArea; /** * 关联场景ID,逗号分隔 */ @ColumnWidth(20) @ExcelProperty("关联场景ID,逗号分隔") private String defenseSceneIds; /** * 关联区域ID,逗号分隔 */ @ColumnWidth(20) @ExcelProperty("关联区域ID,逗号分隔") private String areaDivideIds; /** * 关联设备ID,逗号分隔 */ @ColumnWidth(20) @ExcelProperty("关联设备ID,逗号分隔") private String deviceIds; /** * 经纬度面(存储地理面数据) */ @ColumnWidth(20) @ExcelProperty("经纬度面(存储地理面数据)") private byte[] geom; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwPoliceStationExcel.java
@@ -17,12 +17,12 @@ package org.sxkj.fw.area.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; @@ -30,7 +30,7 @@ * 派出所信息表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +40,53 @@ private static final long serialVersionUID = 1L; /** * 派出所名称 */ @ColumnWidth(20) @ExcelProperty("派出所名称") private String stationName; /** * 派出所地址 */ @ColumnWidth(20) @ExcelProperty("派出所地址") private String address; /** * 经度 */ @ColumnWidth(20) @ExcelProperty("经度") private Double longitude; /** * 纬度 */ @ColumnWidth(20) @ExcelProperty("纬度") private Double latitude; /** * 联系人 */ @ColumnWidth(20) @ExcelProperty("联系人") private String contactPerson; /** * 联系方式 */ @ColumnWidth(20) @ExcelProperty("联系方式") private String contactPhone; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -4,6 +4,29 @@ <!-- 通用查询映射结果 --> <resultMap id="fwAreaDivideResultMap" type="org.sxkj.fw.area.entity.FwAreaDivideEntity"> <result column="id" property="id"/> <result column="area_name" property="areaName"/> <result column="longitude" property="longitude"/> <result column="latitude" property="latitude"/> <result column="area_size" property="areaSize"/> <result column="geom" property="geom"/> <result column="area_type" property="areaType"/> <result column="trigger_condition" property="triggerCondition"/> <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"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -4,6 +4,25 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDefenseSceneResultMap" type="org.sxkj.fw.area.entity.FwDefenseSceneEntity"> <result column="id" property="id"/> <result column="scene_name" property="sceneName"/> <result column="scene_type" property="sceneType"/> <result column="longitude" property="longitude"/> <result column="latitude" property="latitude"/> <result column="defense_leader" property="defenseLeader"/> <result column="leader_phone" property="leaderPhone"/> <result column="defense_area" property="defenseArea"/> <result column="device_mode" property="deviceMode"/> <result column="area_divide_ids" property="areaDivideIds"/> <result column="device_ids" property="deviceIds"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.java
@@ -29,7 +29,7 @@ * 防区管理表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDefenseZoneMapper extends BaseMapper<FwDefenseZoneEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -4,6 +4,21 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDefenseZoneResultMap" type="org.sxkj.fw.area.entity.FwDefenseZoneEntity"> <result column="id" property="id"/> <result column="zone_name" property="zoneName"/> <result column="zone_area" property="zoneArea"/> <result column="defense_scene_ids" property="defenseSceneIds"/> <result column="area_divide_ids" property="areaDivideIds"/> <result column="device_ids" property="deviceIds"/> <result column="geom" property="geom"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.java
@@ -29,7 +29,7 @@ * 派出所信息表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwPoliceStationMapper extends BaseMapper<FwPoliceStationEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.xml
@@ -4,6 +4,21 @@ <!-- 通用查询映射结果 --> <resultMap id="fwPoliceStationResultMap" type="org.sxkj.fw.area.entity.FwPoliceStationEntity"> <result column="id" property="id"/> <result column="station_name" property="stationName"/> <result column="address" property="address"/> <result column="longitude" property="longitude"/> <result column="latitude" property="latitude"/> <result column="contact_person" property="contactPerson"/> <result column="contact_phone" property="contactPhone"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java
@@ -28,7 +28,7 @@ * 区域划分表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwAreaDivideService extends BaseService<FwAreaDivideEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneService.java
@@ -28,7 +28,7 @@ * 防控场景表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDefenseSceneService extends BaseService<FwDefenseSceneEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseZoneService.java
@@ -28,7 +28,7 @@ * 防区管理表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDefenseZoneService extends BaseService<FwDefenseZoneEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwPoliceStationService.java
@@ -28,7 +28,7 @@ * 派出所信息表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwPoliceStationService extends BaseService<FwPoliceStationEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
@@ -31,7 +31,7 @@ * 防控场景表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDefenseSceneServiceImpl extends BaseServiceImpl<FwDefenseSceneMapper, FwDefenseSceneEntity> implements IFwDefenseSceneService { drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
@@ -31,7 +31,7 @@ * 防区管理表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDefenseZoneServiceImpl extends BaseServiceImpl<FwDefenseZoneMapper, FwDefenseZoneEntity> implements IFwDefenseZoneService { drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
@@ -31,7 +31,7 @@ * 派出所信息表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity> implements IFwPoliceStationService { drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java
@@ -25,7 +25,7 @@ * 防控场景表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java
@@ -25,7 +25,7 @@ * 防区管理表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwPoliceStationVO.java
@@ -25,7 +25,7 @@ * 派出所信息表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/area/wrapper/FwDefenseSceneWrapper.java
@@ -26,7 +26,7 @@ * 防控场景表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDefenseSceneWrapper extends BaseEntityWrapper<FwDefenseSceneEntity, FwDefenseSceneVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/area/wrapper/FwDefenseZoneWrapper.java
@@ -26,7 +26,7 @@ * 防区管理表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDefenseZoneWrapper extends BaseEntityWrapper<FwDefenseZoneEntity, FwDefenseZoneVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/area/wrapper/FwPoliceStationWrapper.java
@@ -26,7 +26,7 @@ * 派出所信息表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwPoliceStationWrapper extends BaseEntityWrapper<FwPoliceStationEntity, FwPoliceStationVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwDeviceConfigController.java
@@ -49,7 +49,7 @@ * 设备配置表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java
@@ -49,7 +49,7 @@ * 反制效果评估表 控制器 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwTaskScheduleController.java
@@ -49,7 +49,7 @@ * 任务调度记录表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java
@@ -24,7 +24,7 @@ * 设备配置表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java
@@ -24,7 +24,7 @@ * 反制效果评估表 数据传输对象实体类 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwTaskScheduleDTO.java
@@ -24,7 +24,7 @@ * 任务调度记录表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwDeviceConfigEntity.java
@@ -17,18 +17,17 @@ package org.sxkj.fw.detection.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; /** * 设备配置表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_device_config") @@ -36,5 +35,30 @@ @EqualsAndHashCode(callSuper = true) public class FwDeviceConfigEntity extends BaseEntity { /** * 设备ID(tz_device_deploy.id) */ @ApiModelProperty(value = "设备ID(tz_device_deploy.id)") private Long deviceId; /** * 配置版本号 */ @ApiModelProperty(value = "配置版本号") private Integer configVersion; /** * 是否最新 1最新 0历史 */ @ApiModelProperty(value = "是否最新 1最新 0历史") private Byte isLatest; /** * 全部参数(JSON) */ @ApiModelProperty(value = "全部参数(JSON)") private String configJson; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
@@ -17,18 +17,19 @@ package org.sxkj.fw.detection.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; /** * 反制效果评估表 实体类 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_effect_eval") @@ -36,5 +37,85 @@ @EqualsAndHashCode(callSuper = true) public class FwEffectEvalEntity extends BaseEntity { /** * 告警记录ID(ja_fw_drone_alarm_record.id) */ @ApiModelProperty(value = "告警记录ID(ja_fw_drone_alarm_record.id)") private Long alarmRecordId; /** * 反制设备ID(ja_fw_device.id) */ @ApiModelProperty(value = "反制设备ID(ja_fw_device.id)") private Long deviceId; /** * 反制设备编码(快照) */ @ApiModelProperty(value = "反制设备编码(快照)") private String deviceCode; /** * 反制设备名称(快照) */ @ApiModelProperty(value = "反制设备名称(快照)") private String deviceName; /** * 反制设备型号(快照) */ @ApiModelProperty(value = "反制设备型号(快照)") private String deviceModel; /** * 反制设备类型(快照) */ @ApiModelProperty(value = "反制设备类型(快照)") private String deviceType; /** * 无人机名称 */ @ApiModelProperty(value = "无人机名称") private String droneName; /** * 无人机类型 */ @ApiModelProperty(value = "无人机类型") private String droneType; /** * 无人机设备编码 */ @ApiModelProperty(value = "无人机设备编码") private String droneDeviceCode; /** * 发现时间 */ @ApiModelProperty(value = "发现时间") private Date findTime; /** * 反制效果(success/fail) */ @ApiModelProperty(value = "反制效果(success/fail)") private String counterEffect; /** * 部署经度(冗余) */ @ApiModelProperty(value = "部署经度(冗余)") private Double deployLongitude; /** * 部署纬度(冗余) */ @ApiModelProperty(value = "部署纬度(冗余)") private Double deployLatitude; /** * 覆盖范围(米) */ @ApiModelProperty(value = "覆盖范围(米)") private Integer coverRadiusM; /** * 工作模式(机动/固定) */ @ApiModelProperty(value = "工作模式(机动/固定)") private String workMode; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwTaskScheduleEntity.java
@@ -17,18 +17,19 @@ package org.sxkj.fw.detection.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; /** * 任务调度记录表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_task_schedule") @@ -36,5 +37,65 @@ @EqualsAndHashCode(callSuper = true) public class FwTaskScheduleEntity extends BaseEntity { /** * 设备ID(ja_fw_device.id) */ @ApiModelProperty(value = "设备ID(ja_fw_device.id)") private Long deviceId; /** * 关联区域ID */ @ApiModelProperty(value = "关联区域ID") private Long areaDivideId; /** * 关联场景ID */ @ApiModelProperty(value = "关联场景ID") private Long defenseSceneId; /** * 调度经度 */ @ApiModelProperty(value = "调度经度") private Double longitude; /** * 调度纬度 */ @ApiModelProperty(value = "调度纬度") private Double latitude; /** * 调度人员 */ @ApiModelProperty(value = "调度人员") private String dispatchUser; /** * 调度日期-开始 */ @ApiModelProperty(value = "调度日期-开始") private Date dispatchStartTime; /** * 调度日期-结束 */ @ApiModelProperty(value = "调度日期-结束") private Date dispatchEndTime; /** * 调度内容 */ @ApiModelProperty(value = "调度内容") private String dispatchContent; /** * 调度结果 */ @ApiModelProperty(value = "调度结果") private String dispatchResult; /** * 处置措施 */ @ApiModelProperty(value = "处置措施") private String disposeMeasure; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/excel/FwDeviceConfigExcel.java
@@ -17,12 +17,12 @@ package org.sxkj.fw.detection.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; @@ -30,7 +30,7 @@ * 设备配置表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +40,41 @@ private static final long serialVersionUID = 1L; /** * 设备ID(tz_device_deploy.id) */ @ColumnWidth(20) @ExcelProperty("设备ID(tz_device_deploy.id)") private Long deviceId; /** * 配置版本号 */ @ColumnWidth(20) @ExcelProperty("配置版本号") private Integer configVersion; /** * 是否最新 1最新 0历史 */ @ColumnWidth(20) @ExcelProperty("是否最新 1最新 0历史") private Byte isLatest; /** * 全部参数(JSON) */ @ColumnWidth(20) @ExcelProperty("全部参数(JSON)") private String configJson; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/excel/FwEffectEvalExcel.java
@@ -17,20 +17,21 @@ package org.sxkj.fw.detection.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * 反制效果评估表 Excel实体类 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +41,107 @@ private static final long serialVersionUID = 1L; /** * 告警记录ID(ja_fw_drone_alarm_record.id) */ @ColumnWidth(20) @ExcelProperty("告警记录ID(ja_fw_drone_alarm_record.id)") private Long alarmRecordId; /** * 反制设备ID(ja_fw_device.id) */ @ColumnWidth(20) @ExcelProperty("反制设备ID(ja_fw_device.id)") private Long deviceId; /** * 反制设备编码(快照) */ @ColumnWidth(20) @ExcelProperty("反制设备编码(快照)") private String deviceCode; /** * 反制设备名称(快照) */ @ColumnWidth(20) @ExcelProperty("反制设备名称(快照)") private String deviceName; /** * 反制设备型号(快照) */ @ColumnWidth(20) @ExcelProperty("反制设备型号(快照)") private String deviceModel; /** * 反制设备类型(快照) */ @ColumnWidth(20) @ExcelProperty("反制设备类型(快照)") private String deviceType; /** * 无人机名称 */ @ColumnWidth(20) @ExcelProperty("无人机名称") private String droneName; /** * 无人机类型 */ @ColumnWidth(20) @ExcelProperty("无人机类型") private String droneType; /** * 无人机设备编码 */ @ColumnWidth(20) @ExcelProperty("无人机设备编码") private String droneDeviceCode; /** * 发现时间 */ @ColumnWidth(20) @ExcelProperty("发现时间") private Date findTime; /** * 反制效果(success/fail) */ @ColumnWidth(20) @ExcelProperty("反制效果(success/fail)") private String counterEffect; /** * 部署经度(冗余) */ @ColumnWidth(20) @ExcelProperty("部署经度(冗余)") private Double deployLongitude; /** * 部署纬度(冗余) */ @ColumnWidth(20) @ExcelProperty("部署纬度(冗余)") private Double deployLatitude; /** * 覆盖范围(米) */ @ColumnWidth(20) @ExcelProperty("覆盖范围(米)") private Integer coverRadiusM; /** * 工作模式(机动/固定) */ @ColumnWidth(20) @ExcelProperty("工作模式(机动/固定)") private String workMode; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/excel/FwTaskScheduleExcel.java
@@ -17,20 +17,21 @@ package org.sxkj.fw.detection.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * 任务调度记录表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +41,83 @@ private static final long serialVersionUID = 1L; /** * 设备ID(ja_fw_device.id) */ @ColumnWidth(20) @ExcelProperty("设备ID(ja_fw_device.id)") private Long deviceId; /** * 关联区域ID */ @ColumnWidth(20) @ExcelProperty("关联区域ID") private Long areaDivideId; /** * 关联场景ID */ @ColumnWidth(20) @ExcelProperty("关联场景ID") private Long defenseSceneId; /** * 调度经度 */ @ColumnWidth(20) @ExcelProperty("调度经度") private Double longitude; /** * 调度纬度 */ @ColumnWidth(20) @ExcelProperty("调度纬度") private Double latitude; /** * 调度人员 */ @ColumnWidth(20) @ExcelProperty("调度人员") private String dispatchUser; /** * 调度日期-开始 */ @ColumnWidth(20) @ExcelProperty("调度日期-开始") private Date dispatchStartTime; /** * 调度日期-结束 */ @ColumnWidth(20) @ExcelProperty("调度日期-结束") private Date dispatchEndTime; /** * 调度内容 */ @ColumnWidth(20) @ExcelProperty("调度内容") private String dispatchContent; /** * 调度结果 */ @ColumnWidth(20) @ExcelProperty("调度结果") private String dispatchResult; /** * 处置措施 */ @ColumnWidth(20) @ExcelProperty("处置措施") private String disposeMeasure; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.java
@@ -29,7 +29,7 @@ * 设备配置表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDeviceConfigMapper extends BaseMapper<FwDeviceConfigEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
@@ -4,6 +4,19 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDeviceConfigResultMap" type="org.sxkj.fw.detection.entity.FwDeviceConfigEntity"> <result column="id" property="id"/> <result column="device_id" property="deviceId"/> <result column="config_version" property="configVersion"/> <result column="is_latest" property="isLatest"/> <result column="config_json" property="configJson"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.java
@@ -29,7 +29,7 @@ * 反制效果评估表 Mapper 接口 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ public interface FwEffectEvalMapper extends BaseMapper<FwEffectEvalEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -4,6 +4,30 @@ <!-- 通用查询映射结果 --> <resultMap id="fwEffectEvalResultMap" type="org.sxkj.fw.detection.entity.FwEffectEvalEntity"> <result column="id" property="id"/> <result column="alarm_record_id" property="alarmRecordId"/> <result column="device_id" property="deviceId"/> <result column="device_code" property="deviceCode"/> <result column="device_name" property="deviceName"/> <result column="device_model" property="deviceModel"/> <result column="device_type" property="deviceType"/> <result column="drone_name" property="droneName"/> <result column="drone_type" property="droneType"/> <result column="drone_device_code" property="droneDeviceCode"/> <result column="find_time" property="findTime"/> <result column="counter_effect" property="counterEffect"/> <result column="deploy_longitude" property="deployLongitude"/> <result column="deploy_latitude" property="deployLatitude"/> <result column="cover_radius_m" property="coverRadiusM"/> <result column="work_mode" property="workMode"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.java
@@ -29,7 +29,7 @@ * 任务调度记录表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwTaskScheduleMapper extends BaseMapper<FwTaskScheduleEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -4,6 +4,26 @@ <!-- 通用查询映射结果 --> <resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.entity.FwTaskScheduleEntity"> <result column="id" property="id"/> <result column="device_id" property="deviceId"/> <result column="area_divide_id" property="areaDivideId"/> <result column="defense_scene_id" property="defenseSceneId"/> <result column="longitude" property="longitude"/> <result column="latitude" property="latitude"/> <result column="dispatch_user" property="dispatchUser"/> <result column="dispatch_start_time" property="dispatchStartTime"/> <result column="dispatch_end_time" property="dispatchEndTime"/> <result column="dispatch_content" property="dispatchContent"/> <result column="dispatch_result" property="dispatchResult"/> <result column="dispose_measure" property="disposeMeasure"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwDeviceConfigService.java
@@ -28,7 +28,7 @@ * 设备配置表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDeviceConfigService extends BaseService<FwDeviceConfigEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwEffectEvalService.java
@@ -28,7 +28,7 @@ * 反制效果评估表 服务类 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwEffectEvalService extends BaseService<FwEffectEvalEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwTaskScheduleService.java
@@ -28,7 +28,7 @@ * 任务调度记录表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwTaskScheduleService extends BaseService<FwTaskScheduleEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwDeviceConfigServiceImpl.java
@@ -31,7 +31,7 @@ * 设备配置表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDeviceConfigServiceImpl extends BaseServiceImpl<FwDeviceConfigMapper, FwDeviceConfigEntity> implements IFwDeviceConfigService { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java
@@ -31,7 +31,7 @@ * 反制效果评估表 服务实现类 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwEffectEvalServiceImpl extends BaseServiceImpl<FwEffectEvalMapper, FwEffectEvalEntity> implements IFwEffectEvalService { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java
@@ -31,7 +31,7 @@ * 任务调度记录表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwTaskScheduleServiceImpl extends BaseServiceImpl<FwTaskScheduleMapper, FwTaskScheduleEntity> implements IFwTaskScheduleService { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java
@@ -25,7 +25,7 @@ * 设备配置表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java
@@ -25,7 +25,7 @@ * 反制效果评估表 视图实体类 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java
@@ -25,7 +25,7 @@ * 任务调度记录表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/wrapper/FwDeviceConfigWrapper.java
@@ -26,7 +26,7 @@ * 设备配置表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDeviceConfigWrapper extends BaseEntityWrapper<FwDeviceConfigEntity, FwDeviceConfigVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/wrapper/FwEffectEvalWrapper.java
@@ -26,7 +26,7 @@ * 反制效果评估表 包装类,返回视图层所需的字段 * * @author BladeX * @since 2026-01-07 * @since 2026-01-08 */ public class FwEffectEvalWrapper extends BaseEntityWrapper<FwEffectEvalEntity, FwEffectEvalVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/wrapper/FwTaskScheduleWrapper.java
@@ -26,7 +26,7 @@ * 任务调度记录表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwTaskScheduleWrapper extends BaseEntityWrapper<FwTaskScheduleEntity, FwTaskScheduleVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceMaintainPlanController.java
@@ -49,7 +49,7 @@ * 设备维护计划表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceMaintainRecordController.java
@@ -49,7 +49,7 @@ * 设备维护记录表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java
@@ -49,7 +49,7 @@ * 设备报废记录表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainPlanDTO.java
@@ -24,7 +24,7 @@ * 设备维护计划表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainRecordDTO.java
@@ -24,7 +24,7 @@ * 设备维护记录表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java
@@ -24,7 +24,7 @@ * 设备报废记录表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
@@ -17,18 +17,19 @@ package org.sxkj.fw.device.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.time.LocalDate; /** * 设备维护计划表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_device_maintain_plan") @@ -36,5 +37,25 @@ @EqualsAndHashCode(callSuper = true) public class FwDeviceMaintainPlanEntity extends BaseEntity { /** * 设备ID */ @ApiModelProperty(value = "设备ID") private Long deviceId; /** * 计划周期(每月1日/每季1日等) */ @ApiModelProperty(value = "计划周期(每月1日/每季1日等)") private String planCycle; /** * 计划日期(YYYY-MM-DD) */ @ApiModelProperty(value = "计划日期(YYYY-MM-DD)") private LocalDate planTime; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainRecordEntity.java
@@ -17,18 +17,19 @@ package org.sxkj.fw.device.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; /** * 设备维护记录表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_device_maintain_record") @@ -36,5 +37,45 @@ @EqualsAndHashCode(callSuper = true) public class FwDeviceMaintainRecordEntity extends BaseEntity { /** * 设备ID */ @ApiModelProperty(value = "设备ID") private Long deviceId; /** * 对应计划ID(空表示临时维护) */ @ApiModelProperty(value = "对应计划ID(空表示临时维护)") private Long planId; /** * 实际维护时间 */ @ApiModelProperty(value = "实际维护时间") private Date maintainTime; /** * 维护内容 */ @ApiModelProperty(value = "维护内容") private String maintainContent; /** * 更换部件 */ @ApiModelProperty(value = "更换部件") private String replacePart; /** * 维护结果(已维护/已保养/故障未修复等) */ @ApiModelProperty(value = "维护结果(已维护/已保养/故障未修复等)") private String maintainResult; /** * 备注 */ @ApiModelProperty(value = "备注") private String remark; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceScrapEntity.java
@@ -17,18 +17,19 @@ package org.sxkj.fw.device.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; /** * 设备报废记录表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_device_scrap") @@ -36,5 +37,30 @@ @EqualsAndHashCode(callSuper = true) public class FwDeviceScrapEntity extends BaseEntity { /** * 设备ID(关联ja_fw_device.id) */ @ApiModelProperty(value = "设备ID(关联ja_fw_device.id)") private Long deviceId; /** * 报废时间 */ @ApiModelProperty(value = "报废时间") private Date scrapTime; /** * 报废原因 */ @ApiModelProperty(value = "报废原因") private String scrapReason; /** * 处置方式 */ @ApiModelProperty(value = "处置方式") private String disposeWay; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceMaintainPlanExcel.java
@@ -17,20 +17,21 @@ package org.sxkj.fw.device.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.time.LocalDate; /** * 设备维护计划表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +41,35 @@ private static final long serialVersionUID = 1L; /** * 设备ID */ @ColumnWidth(20) @ExcelProperty("设备ID") private Long deviceId; /** * 计划周期(每月1日/每季1日等) */ @ColumnWidth(20) @ExcelProperty("计划周期(每月1日/每季1日等)") private String planCycle; /** * 计划日期(YYYY-MM-DD) */ @ColumnWidth(20) @ExcelProperty("计划日期(YYYY-MM-DD)") private LocalDate planTime; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceMaintainRecordExcel.java
@@ -17,20 +17,21 @@ package org.sxkj.fw.device.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * 设备维护记录表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +41,59 @@ private static final long serialVersionUID = 1L; /** * 设备ID */ @ColumnWidth(20) @ExcelProperty("设备ID") private Long deviceId; /** * 对应计划ID(空表示临时维护) */ @ColumnWidth(20) @ExcelProperty("对应计划ID(空表示临时维护)") private Long planId; /** * 实际维护时间 */ @ColumnWidth(20) @ExcelProperty("实际维护时间") private Date maintainTime; /** * 维护内容 */ @ColumnWidth(20) @ExcelProperty("维护内容") private String maintainContent; /** * 更换部件 */ @ColumnWidth(20) @ExcelProperty("更换部件") private String replacePart; /** * 维护结果(已维护/已保养/故障未修复等) */ @ColumnWidth(20) @ExcelProperty("维护结果(已维护/已保养/故障未修复等)") private String maintainResult; /** * 备注 */ @ColumnWidth(20) @ExcelProperty("备注") private String remark; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceScrapExcel.java
@@ -17,20 +17,21 @@ package org.sxkj.fw.device.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * 设备报废记录表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +41,41 @@ private static final long serialVersionUID = 1L; /** * 设备ID(关联ja_fw_device.id) */ @ColumnWidth(20) @ExcelProperty("设备ID(关联ja_fw_device.id)") private Long deviceId; /** * 报废时间 */ @ColumnWidth(20) @ExcelProperty("报废时间") private Date scrapTime; /** * 报废原因 */ @ColumnWidth(20) @ExcelProperty("报废原因") private String scrapReason; /** * 处置方式 */ @ColumnWidth(20) @ExcelProperty("处置方式") private String disposeWay; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.java
@@ -29,7 +29,7 @@ * 设备维护计划表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDeviceMaintainPlanMapper extends BaseMapper<FwDeviceMaintainPlanEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -4,6 +4,18 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDeviceMaintainPlanResultMap" type="org.sxkj.fw.device.entity.FwDeviceMaintainPlanEntity"> <result column="id" property="id"/> <result column="device_id" property="deviceId"/> <result column="plan_cycle" property="planCycle"/> <result column="plan_time" property="planTime"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.java
@@ -29,7 +29,7 @@ * 设备维护记录表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDeviceMaintainRecordMapper extends BaseMapper<FwDeviceMaintainRecordEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
@@ -4,6 +4,22 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDeviceMaintainRecordResultMap" type="org.sxkj.fw.device.entity.FwDeviceMaintainRecordEntity"> <result column="id" property="id"/> <result column="device_id" property="deviceId"/> <result column="plan_id" property="planId"/> <result column="maintain_time" property="maintainTime"/> <result column="maintain_content" property="maintainContent"/> <result column="replace_part" property="replacePart"/> <result column="maintain_result" property="maintainResult"/> <result column="remark" property="remark"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.java
@@ -29,7 +29,7 @@ * 设备报废记录表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDeviceScrapMapper extends BaseMapper<FwDeviceScrapEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
@@ -4,6 +4,19 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDeviceScrapResultMap" type="org.sxkj.fw.device.entity.FwDeviceScrapEntity"> <result column="id" property="id"/> <result column="device_id" property="deviceId"/> <result column="scrap_time" property="scrapTime"/> <result column="scrap_reason" property="scrapReason"/> <result column="dispose_way" property="disposeWay"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceMaintainPlanService.java
@@ -28,7 +28,7 @@ * 设备维护计划表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDeviceMaintainPlanService extends BaseService<FwDeviceMaintainPlanEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceMaintainRecordService.java
@@ -28,7 +28,7 @@ * 设备维护记录表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDeviceMaintainRecordService extends BaseService<FwDeviceMaintainRecordEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceScrapService.java
@@ -28,7 +28,7 @@ * 设备报废记录表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDeviceScrapService extends BaseService<FwDeviceScrapEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceMaintainPlanServiceImpl.java
@@ -31,7 +31,7 @@ * 设备维护计划表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDeviceMaintainPlanServiceImpl extends BaseServiceImpl<FwDeviceMaintainPlanMapper, FwDeviceMaintainPlanEntity> implements IFwDeviceMaintainPlanService { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceMaintainRecordServiceImpl.java
@@ -31,7 +31,7 @@ * 设备维护记录表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDeviceMaintainRecordServiceImpl extends BaseServiceImpl<FwDeviceMaintainRecordMapper, FwDeviceMaintainRecordEntity> implements IFwDeviceMaintainRecordService { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
@@ -31,7 +31,7 @@ * 设备报废记录表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDeviceScrapServiceImpl extends BaseServiceImpl<FwDeviceScrapMapper, FwDeviceScrapEntity> implements IFwDeviceScrapService { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
@@ -25,7 +25,7 @@ * 设备维护计划表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainRecordVO.java
@@ -25,7 +25,7 @@ * 设备维护记录表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceScrapVO.java
@@ -25,7 +25,7 @@ * 设备报废记录表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainPlanWrapper.java
@@ -26,7 +26,7 @@ * 设备维护计划表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDeviceMaintainPlanWrapper extends BaseEntityWrapper<FwDeviceMaintainPlanEntity, FwDeviceMaintainPlanVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainRecordWrapper.java
@@ -26,7 +26,7 @@ * 设备维护记录表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDeviceMaintainRecordWrapper extends BaseEntityWrapper<FwDeviceMaintainRecordEntity, FwDeviceMaintainRecordVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceScrapWrapper.java
@@ -26,7 +26,7 @@ * 设备报废记录表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDeviceScrapWrapper extends BaseEntityWrapper<FwDeviceScrapEntity, FwDeviceScrapVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneAlarmRecordController.java
@@ -49,7 +49,7 @@ * 无人机告警表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordController.java
@@ -49,7 +49,7 @@ * 无人机飞行记录表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java
@@ -49,7 +49,7 @@ * 无人机飞行记录详情表 控制器 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @RestController @AllArgsConstructor drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
@@ -16,15 +16,15 @@ */ package org.sxkj.fw.record.dto; import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity; /** * 无人机告警表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
@@ -24,7 +24,7 @@ * 无人机飞行记录表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDetailDTO.java
@@ -24,7 +24,7 @@ * 无人机飞行记录详情表 数据传输对象实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
@@ -17,18 +17,21 @@ package org.sxkj.fw.record.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.math.BigDecimal; import java.time.LocalTime; import java.util.Date; /** * 无人机告警表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_drone_alarm_record") @@ -36,5 +39,95 @@ @EqualsAndHashCode(callSuper = true) public class FwDroneAlarmRecordEntity extends BaseEntity { /** * 反无设备ID(关联ja_fw_device.id) */ @ApiModelProperty(value = "反无设备ID(关联ja_fw_device.id)") private Long deviceId; /** * 无人机名称 */ @ApiModelProperty(value = "无人机名称") private String droneName; /** * 无人机序列号 */ @ApiModelProperty(value = "无人机序列号") private String droneSerialNo; /** * 无人机类型(微型机/植保机...) */ @ApiModelProperty(value = "无人机类型(微型机/植保机...)") private String droneType; /** * 告警类型:实时告警/历史告警 */ @ApiModelProperty(value = "告警类型:实时告警/历史告警") private String alarmType; /** * 告警时间 */ @ApiModelProperty(value = "告警时间") private Date alarmTime; /** * 触发原因 */ @ApiModelProperty(value = "触发原因") private String triggerReason; /** * 飞行状态:侦测中/反制中 */ @ApiModelProperty(value = "飞行状态:侦测中/反制中") private String flightStatus; /** * 当前经度 */ @ApiModelProperty(value = "当前经度") private Double longitude; /** * 当前纬度 */ @ApiModelProperty(value = "当前纬度") private Double latitude; /** * 信号频段(MHz) */ @ApiModelProperty(value = "信号频段(MHz)") private Integer signalFreqMhz; /** * 飞行高度(m) */ @ApiModelProperty(value = "飞行高度(m)") private Integer flightHeightM; /** * 飞行速度(m/s) */ @ApiModelProperty(value = "飞行速度(m/s)") private BigDecimal flightSpeedMs; /** * 停留时长 HH:MM:SS */ @ApiModelProperty(value = "停留时长 HH:MM:SS") private LocalTime stayDuration; /** * 反制方式:信号干扰/诱导驱离/无 */ @ApiModelProperty(value = "反制方式:信号干扰/诱导驱离/无") private String counterWay; /** * 区域id ja_fw_area_divide */ @ApiModelProperty(value = "区域id ja_fw_area_divide") private String areaDivideId; /** * 场景id ja_fw_defense_scene.id */ @ApiModelProperty(value = "场景id ja_fw_defense_scene.id") private String defenseSceneId; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneFlightRecordDetailEntity.java
@@ -17,24 +17,50 @@ package org.sxkj.fw.record.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; /** * 无人机飞行记录详情表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_drone_flight_record_detail") @ApiModel(value = "FwDroneFlightRecordDetail对象", description = "无人机飞行记录详情表") @EqualsAndHashCode(callSuper = true) public class FwDroneFlightRecordDetailEntity extends BaseEntity { public class FwDroneFlightRecordDetailEntity extends TenantEntity { /** * 飞行记录表ID */ @ApiModelProperty(value = "飞行记录表ID") private Long flightRecordId; /** * 经度 */ @ApiModelProperty(value = "经度") private Double longitude; /** * 纬度 */ @ApiModelProperty(value = "纬度") private Double latitude; /** * 点位时间 */ @ApiModelProperty(value = "点位时间") private Date pointTime; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneFlightRecordEntity.java
@@ -17,18 +17,20 @@ package org.sxkj.fw.record.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; import java.time.LocalTime; import java.util.Date; /** * 无人机飞行记录表 实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @TableName("ja_fw_drone_flight_record") @@ -36,5 +38,40 @@ @EqualsAndHashCode(callSuper = true) public class FwDroneFlightRecordEntity extends BaseEntity { /** * 反无设备ID(关联ja_fw_device.id) */ @ApiModelProperty(value = "反无设备ID(关联ja_fw_device.id)") private Long deviceId; /** * 无人机名称 */ @ApiModelProperty(value = "无人机名称") private String droneName; /** * 序列号 */ @ApiModelProperty(value = "序列号") private String serialNo; /** * 首次告警时间 */ @ApiModelProperty(value = "首次告警时间") private Date alarmTime; /** * 触发原因/类型 */ @ApiModelProperty(value = "触发原因/类型") private String triggerType; /** * 停留时长(HH:MM:SS) */ @ApiModelProperty(value = "停留时长(HH:MM:SS)") private LocalTime stayDuration; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java
@@ -17,20 +17,23 @@ package org.sxkj.fw.record.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalTime; import java.util.Date; /** * 无人机告警表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +43,119 @@ private static final long serialVersionUID = 1L; /** * 反无设备ID(关联ja_fw_device.id) */ @ColumnWidth(20) @ExcelProperty("反无设备ID(关联ja_fw_device.id)") private Long deviceId; /** * 无人机名称 */ @ColumnWidth(20) @ExcelProperty("无人机名称") private String droneName; /** * 无人机序列号 */ @ColumnWidth(20) @ExcelProperty("无人机序列号") private String droneSerialNo; /** * 无人机类型(微型机/植保机...) */ @ColumnWidth(20) @ExcelProperty("无人机类型(微型机/植保机...)") private String droneType; /** * 告警类型:实时告警/历史告警 */ @ColumnWidth(20) @ExcelProperty("告警类型:实时告警/历史告警") private String alarmType; /** * 告警时间 */ @ColumnWidth(20) @ExcelProperty("告警时间") private Date alarmTime; /** * 触发原因 */ @ColumnWidth(20) @ExcelProperty("触发原因") private String triggerReason; /** * 飞行状态:侦测中/反制中 */ @ColumnWidth(20) @ExcelProperty("飞行状态:侦测中/反制中") private String flightStatus; /** * 当前经度 */ @ColumnWidth(20) @ExcelProperty("当前经度") private Double longitude; /** * 当前纬度 */ @ColumnWidth(20) @ExcelProperty("当前纬度") private Double latitude; /** * 信号频段(MHz) */ @ColumnWidth(20) @ExcelProperty("信号频段(MHz)") private Integer signalFreqMhz; /** * 飞行高度(m) */ @ColumnWidth(20) @ExcelProperty("飞行高度(m)") private Integer flightHeightM; /** * 飞行速度(m/s) */ @ColumnWidth(20) @ExcelProperty("飞行速度(m/s)") private BigDecimal flightSpeedMs; /** * 停留时长 HH:MM:SS */ @ColumnWidth(20) @ExcelProperty("停留时长 HH:MM:SS") private LocalTime stayDuration; /** * 反制方式:信号干扰/诱导驱离/无 */ @ColumnWidth(20) @ExcelProperty("反制方式:信号干扰/诱导驱离/无") private String counterWay; /** * 区域id ja_fw_area_divide */ @ColumnWidth(20) @ExcelProperty("区域id ja_fw_area_divide") private String areaDivideId; /** * 场景id ja_fw_defense_scene.id */ @ColumnWidth(20) @ExcelProperty("场景id ja_fw_defense_scene.id") private String defenseSceneId; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordDetailExcel.java
@@ -17,20 +17,21 @@ package org.sxkj.fw.record.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * 无人机飞行记录详情表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +41,41 @@ private static final long serialVersionUID = 1L; /** * 飞行记录表ID */ @ColumnWidth(20) @ExcelProperty("飞行记录表ID") private Long flightRecordId; /** * 经度 */ @ColumnWidth(20) @ExcelProperty("经度") private Double longitude; /** * 纬度 */ @ColumnWidth(20) @ExcelProperty("纬度") private Double latitude; /** * 点位时间 */ @ColumnWidth(20) @ExcelProperty("点位时间") private Date pointTime; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java
@@ -17,20 +17,22 @@ package org.sxkj.fw.record.excel; import lombok.Data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; import java.time.LocalTime; import java.util.Date; /** * 无人机飞行记录表 Excel实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @ColumnWidth(25) @@ -40,5 +42,53 @@ private static final long serialVersionUID = 1L; /** * 反无设备ID(关联ja_fw_device.id) */ @ColumnWidth(20) @ExcelProperty("反无设备ID(关联ja_fw_device.id)") private Long deviceId; /** * 无人机名称 */ @ColumnWidth(20) @ExcelProperty("无人机名称") private String droneName; /** * 序列号 */ @ColumnWidth(20) @ExcelProperty("序列号") private String serialNo; /** * 首次告警时间 */ @ColumnWidth(20) @ExcelProperty("首次告警时间") private Date alarmTime; /** * 触发原因/类型 */ @ColumnWidth(20) @ExcelProperty("触发原因/类型") private String triggerType; /** * 停留时长(HH:MM:SS) */ @ColumnWidth(20) @ExcelProperty("停留时长(HH:MM:SS)") private LocalTime stayDuration; /** * 区域编码 */ @ColumnWidth(20) @ExcelProperty("区域编码") private String areaCode; /** * 删除标志(0存在 1删除) */ @ColumnWidth(20) @ExcelProperty("删除标志(0存在 1删除)") private Byte isDeleted; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.java
@@ -29,7 +29,7 @@ * 无人机告警表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDroneAlarmRecordMapper extends BaseMapper<FwDroneAlarmRecordEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -4,6 +4,32 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDroneAlarmRecordResultMap" type="org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity"> <result column="id" property="id"/> <result column="device_id" property="deviceId"/> <result column="drone_name" property="droneName"/> <result column="drone_serial_no" property="droneSerialNo"/> <result column="drone_type" property="droneType"/> <result column="alarm_type" property="alarmType"/> <result column="alarm_time" property="alarmTime"/> <result column="trigger_reason" property="triggerReason"/> <result column="flight_status" property="flightStatus"/> <result column="longitude" property="longitude"/> <result column="latitude" property="latitude"/> <result column="signal_freq_mhz" property="signalFreqMhz"/> <result column="flight_height_m" property="flightHeightM"/> <result column="flight_speed_ms" property="flightSpeedMs"/> <result column="stay_duration" property="stayDuration"/> <result column="counter_way" property="counterWay"/> <result column="area_divide_id" property="areaDivideId"/> <result column="defense_scene_id" property="defenseSceneId"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordDetailMapper.java
@@ -29,7 +29,7 @@ * 无人机飞行记录详情表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDroneFlightRecordDetailMapper extends BaseMapper<FwDroneFlightRecordDetailEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordDetailMapper.xml
@@ -4,6 +4,19 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDroneFlightRecordDetailResultMap" type="org.sxkj.fw.record.entity.FwDroneFlightRecordDetailEntity"> <result column="id" property="id"/> <result column="flight_record_id" property="flightRecordId"/> <result column="longitude" property="longitude"/> <result column="latitude" property="latitude"/> <result column="point_time" property="pointTime"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.java
@@ -29,7 +29,7 @@ * 无人机飞行记录表 Mapper 接口 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface FwDroneFlightRecordMapper extends BaseMapper<FwDroneFlightRecordEntity> { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -4,6 +4,21 @@ <!-- 通用查询映射结果 --> <resultMap id="fwDroneFlightRecordResultMap" type="org.sxkj.fw.record.entity.FwDroneFlightRecordEntity"> <result column="id" property="id"/> <result column="device_id" property="deviceId"/> <result column="drone_name" property="droneName"/> <result column="serial_no" property="serialNo"/> <result column="alarm_time" property="alarmTime"/> <result column="trigger_type" property="triggerType"/> <result column="stay_duration" property="stayDuration"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> </resultMap> drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java
@@ -28,7 +28,7 @@ * 无人机告警表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDroneAlarmRecordService extends BaseService<FwDroneAlarmRecordEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneFlightRecordDetailService.java
@@ -28,7 +28,7 @@ * 无人机飞行记录详情表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDroneFlightRecordDetailService extends BaseService<FwDroneFlightRecordDetailEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneFlightRecordService.java
@@ -28,7 +28,7 @@ * 无人机飞行记录表 服务类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public interface IFwDroneFlightRecordService extends BaseService<FwDroneFlightRecordEntity> { /** drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
@@ -31,7 +31,7 @@ * 无人机告警表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDroneAlarmRecordServiceImpl extends BaseServiceImpl<FwDroneAlarmRecordMapper, FwDroneAlarmRecordEntity> implements IFwDroneAlarmRecordService { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneFlightRecordDetailServiceImpl.java
@@ -31,7 +31,7 @@ * 无人机飞行记录详情表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDroneFlightRecordDetailServiceImpl extends BaseServiceImpl<FwDroneFlightRecordDetailMapper, FwDroneFlightRecordDetailEntity> implements IFwDroneFlightRecordDetailService { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneFlightRecordServiceImpl.java
@@ -31,7 +31,7 @@ * 无人机飞行记录表 服务实现类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Service public class FwDroneFlightRecordServiceImpl extends BaseServiceImpl<FwDroneFlightRecordMapper, FwDroneFlightRecordEntity> implements IFwDroneFlightRecordService { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java
@@ -25,7 +25,7 @@ * 无人机告警表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneFlightRecordDetailVO.java
@@ -25,7 +25,7 @@ * 无人机飞行记录详情表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneFlightRecordVO.java
@@ -25,7 +25,7 @@ * 无人机飞行记录表 视图实体类 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ @Data @EqualsAndHashCode(callSuper = true) drone-service/drone-fw/src/main/java/org/sxkj/fw/record/wrapper/FwDroneAlarmRecordWrapper.java
@@ -26,7 +26,7 @@ * 无人机告警表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDroneAlarmRecordWrapper extends BaseEntityWrapper<FwDroneAlarmRecordEntity, FwDroneAlarmRecordVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/wrapper/FwDroneFlightRecordDetailWrapper.java
@@ -26,7 +26,7 @@ * 无人机飞行记录详情表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDroneFlightRecordDetailWrapper extends BaseEntityWrapper<FwDroneFlightRecordDetailEntity, FwDroneFlightRecordDetailVO> { drone-service/drone-fw/src/main/java/org/sxkj/fw/record/wrapper/FwDroneFlightRecordWrapper.java
@@ -26,7 +26,7 @@ * 无人机飞行记录表 包装类,返回视图层所需的字段 * * @author lw * @since 2026-01-07 * @since 2026-01-08 */ public class FwDroneFlightRecordWrapper extends BaseEntityWrapper<FwDroneFlightRecordEntity, FwDroneFlightRecordVO> {