From 19832d9ee4aa62b19a3a0690836ed29aa5953e48 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 01 Nov 2023 14:57:56 +0800
Subject: [PATCH] 门牌表修改

---
 src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java |   91 +++++++++++++++++++--------------------------
 1 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
index 496e52b..6801b96 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
@@ -16,7 +16,11 @@
  */
 package org.springblade.modules.doorplateAddress.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +40,13 @@
 @ApiModel(value = "DoorplateAddress对象", description = "门牌地址表(总台账数据)")
 public class DoorplateAddressEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("主键id")
+	@TableId(value = "id", type = IdType.ASSIGN_ID)
+	private Long id;
 
 	/**
 	 * 地址编码
@@ -47,16 +58,22 @@
 	 */
 	@ApiModelProperty(value = "地址名称")
 	private String addressName;
+
+	/**
+	 * 门牌地址名称
+	 */
+	@ApiModelProperty(value = "门牌地址名称")
+	private String doorplateAddressName;
 	/**
 	 * 经度
 	 */
 	@ApiModelProperty(value = "经度")
-	private String lng;
+	private String X;
 	/**
 	 * 纬度
 	 */
 	@ApiModelProperty(value = "纬度")
-	private String lat;
+	private String Y;
 	/**
 	 * 行政区编码
 	 */
@@ -138,11 +155,6 @@
 	@ApiModelProperty(value = "单元号(名称)")
 	private String unitName;
 	/**
-	 * 单元号字典码
-	 */
-	@ApiModelProperty(value = "单元号字典码")
-	private String unitNameDict;
-	/**
 	 * 楼栋编码
 	 */
 	@ApiModelProperty(value = "楼栋编码")
@@ -166,22 +178,22 @@
 	 * 小区编码
 	 */
 	@ApiModelProperty(value = "小区编码")
-	private String districtCode;
+	private String aoiCode;
 	/**
 	 * 小区名称
 	 */
 	@ApiModelProperty(value = "小区名称")
-	private String districtName;
+	private String aoiName;
 	/**
-	 * 地址主体编码
+	 * 兴趣点code
 	 */
-	@ApiModelProperty(value = "地址主体编码")
-	private String addressSubjectCode;
+	@ApiModelProperty(value = "兴趣点code")
+	private String poiCode;
 	/**
-	 * 地址主体
+	 * 兴趣点名称
 	 */
-	@ApiModelProperty(value = "地址主体")
-	private String addressSubject;
+	@ApiModelProperty(value = "兴趣点名称")
+	private String poi;
 	/**
 	 * 地址级别
 	 */
@@ -192,11 +204,6 @@
 	 */
 	@ApiModelProperty(value = "父节点地址编码")
 	private String parentAddressCode;
-	/**
-	 * 门牌地址编码
-	 */
-	@ApiModelProperty(value = "门牌地址编码")
-	private String houseAddressCode;
 	/**
 	 * 采集照片url
 	 */
@@ -228,45 +235,30 @@
 	@ApiModelProperty(value = "门牌名称")
 	private String doorplateName;
 	/**
-	 * 支门牌号
+	 * 二维码路径
 	 */
-	@ApiModelProperty(value = "支门牌号")
-	private String branchDoorplateNum;
+	@ApiModelProperty(value = "二维码路径")
+	private String qrCodePath;
 	/**
 	 * 大门名称
 	 */
 	@ApiModelProperty(value = "大门名称")
 	private String gateName;
 	/**
-	 * 子小区名称
-	 */
-	@ApiModelProperty(value = "子小区名称")
-	private String childDistrictName;
-	/**
 	 * 操作类型
 	 */
 	@ApiModelProperty(value = "操作类型")
 	private Integer operationType;
 	/**
-	 * 经度-百度
+	 * 地址类型
 	 */
-	@ApiModelProperty(value = "经度-百度")
-	private String baiduLng;
+	@ApiModelProperty(value = "地址类型")
+	private Integer addressType;
 	/**
-	 * 纬度-百度
+	 * 子小区名称
 	 */
-	@ApiModelProperty(value = "纬度-百度")
-	private String baiduLat;
-	/**
-	 * 经度-2000
-	 */
-	@ApiModelProperty(value = "经度-2000")
-	private String twoThoLng;
-	/**
-	 * 纬度-2000
-	 */
-	@ApiModelProperty(value = "纬度-2000")
-	private String twoThoLat;
+	@ApiModelProperty(value = "子小区名称")
+	private String subAoi;
 	/**
 	 * 民警姓名
 	 */
@@ -278,14 +270,9 @@
 	@ApiModelProperty(value = "民警电话")
 	private String policemanPhone;
 	/**
-	 * 同来源分组
+	 * 警务网格编码
 	 */
-	@ApiModelProperty(value = "同来源分组")
-	private String sourceGroup;
-	/**
-	 * 是否预留
-	 */
-	@ApiModelProperty(value = "是否预留")
-	private String isReserved;
+	@ApiModelProperty(value = "警务网格编码")
+	private String jwwgCode;
 
 }

--
Gitblit v1.9.3