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/dto/FwAreaDivideDTO.java | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 77 insertions(+), 20 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
index f8fdf7a..793240d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
@@ -16,17 +16,23 @@
*/
package org.sxkj.fw.area.dto;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 区域划分表 数据传输对象实体类
@@ -35,10 +41,11 @@
* @since 2026-01-07
*/
@Data
-public class FwAreaDivideDTO {
+public class FwAreaDivideDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 区域名称
@@ -64,7 +71,7 @@
* 经纬度面（存储地理面数据）
*/
@ApiModelProperty(value = "经纬度面（存储地理面数据）")
- private byte[] geom;
+ private String geom;
/**
* 区域类型：报警区/重点管制区
*/
@@ -91,28 +98,78 @@
@ApiModelProperty(value = "关联派出所id")
private Long policeStationId;
/**
- * 可飞行时间段-开始
+ * 关联设备ID，逗号分隔
*/
- @ApiModelProperty(value = "可飞行时间段-开始")
- private LocalTime flyTimeStart;
+ @ApiModelProperty(value = "关联设备ID，逗号分隔")
+ private String deviceIds;
/**
- * 可飞行时间段-结束
+ * 可飞行日期时间-开始
*/
- @ApiModelProperty(value = "可飞行时间段-结束")
- private LocalTime flyTimeEnd;
+ @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 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;
/**
* 区域编码
*/
@ApiModelProperty(value = "区域编码")
private String areaCode;
+ /**
+ * 区域类型key集合（逗号分隔）
+ */
+ @ApiModelProperty(value = "区域类型key集合（逗号分隔）")
+ private String areaTypeKeys;
+
+ @ApiModelProperty(value = "区域类型key集合", hidden = true)
+ private List<String> areaTypeKeyList;
+
+ @ApiModelProperty(value = "部门集合",hidden = true)
+ private List<Long> deptList;
+
+
+
+
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
+ /**
+ * 删除标志（0存在 1删除）
+ */
+ @ApiModelProperty(value = "删除标志（0存在 1删除）")
+ private Integer isDeleted;
}
--
Gitblit v1.9.3