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/vo/FwAreaDivideVO.java |   83 ++++++++---------------------------------
 1 files changed, 17 insertions(+), 66 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
index 28f2452..2a6f2f9 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
@@ -16,15 +16,13 @@
  */
 package org.sxkj.fw.area.vo;
 
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 区域划分表 视图实体类
@@ -34,44 +32,17 @@
  */
 @Data
 public class FwAreaDivideVO implements Serializable {
+
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 主键id
-	 */
 	@ApiModelProperty(value = "主键id")
-	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
+
 	/**
 	 * 区域名称
 	 */
 	@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 String geom;
-	/**
-	 * 区域类型:报警区/重点管制区
-	 */
-	@ApiModelProperty(value = "区域类型:报警区/重点管制区")
-	private String areaType;
 	/**
 	 * 触发条件
 	 */
@@ -91,8 +62,7 @@
 	 * 关联派出所id
 	 */
 	@ApiModelProperty(value = "关联派出所id")
-	@JsonSerialize(using = ToStringSerializer.class)
-	private Long policeStationId;
+	private String policeStationId;
 	/**
 	 * 关联设备ID,逗号分隔
 	 */
@@ -116,51 +86,32 @@
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
 	/**
-	 * 创建人
+	 * 区域面的类型集合,逗号隔开
 	 */
-	@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;
+	@ApiModelProperty(value = "区域面的类型集合逗号隔开")
+	private String areaTypeKeys;
 
-	// VO 扩展字段
 	/**
 	 * 派出所名称
 	 */
 	@ApiModelProperty(value = "派出所名称")
 	private String policeStationName;
+
 	/**
 	 * 派出所联系人
 	 */
 	@ApiModelProperty(value = "派出所联系人")
 	private String policeStationContactPerson;
+
 	/**
 	 * 派出所联系电话
 	 */
 	@ApiModelProperty(value = "派出所联系电话")
 	private String policeStationContactPhone;
+	/**
+	 * 面数据
+	 */
+	@ApiModelProperty(value = "面数据")
+	private List<FwAreaDivideExtVO> fwAreaDivideExtList;
 
 }

--
Gitblit v1.9.3