From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java | 68 ++++++++++------------------------
1 files changed, 20 insertions(+), 48 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
index 5cbe1c0..395e95a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
+++ b/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;
/**
* 区域划分表 实体类
@@ -46,36 +46,6 @@
@TableField("area_name")
@ApiModelProperty(value = "区域名称")
private String areaName;
- /**
- * 区域中心经度
- */
- @TableField("longitude")
- @ApiModelProperty(value = "区域中心经度")
- private Double longitude;
- /**
- * 区域中心纬度
- */
- @TableField("latitude")
- @ApiModelProperty(value = "区域中心纬度")
- private Double latitude;
- /**
- * 区域面积（km²）
- */
- @TableField("area_size")
- @ApiModelProperty(value = "区域面积（km²）")
- private BigDecimal areaSize;
- /**
- * 经纬度面（存储地理面数据）
- */
- @TableField("geom")
- @ApiModelProperty(value = "经纬度面（存储地理面数据）")
- private byte[] geom;
- /**
- * 区域类型：报警区/重点管制区
- */
- @TableField("area_type")
- @ApiModelProperty(value = "区域类型：报警区/重点管制区")
- private String areaType;
/**
* 触发条件
*/
@@ -101,34 +71,36 @@
@ApiModelProperty(value = "关联派出所id")
private Long policeStationId;
/**
- * 可飞行时间段-开始
+ * 关联设备ID，逗号分隔
*/
- @TableField("fly_time_start")
- @ApiModelProperty(value = "可飞行时间段-开始")
- private LocalTime flyTimeStart;
+ @TableField("device_ids")
+ @ApiModelProperty(value = "关联设备ID，逗号分隔")
+ private String deviceIds;
/**
- * 可飞行时间段-结束
- */
- @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;
/**
* 区域编码
*/
@TableField("area_code")
@ApiModelProperty(value = "区域编码")
private String areaCode;
+ /**
+ * 区域面的类型集合，逗号隔开
+ */
+ @TableField("area_type_keys")
+ @ApiModelProperty(value = "区域面的类型集合逗号隔开")
+ private String areaTypeKeys;
}
--
Gitblit v1.9.3