From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/place/entity/PlaceEntity.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
index 35e8b0d..6a883e6 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.place.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -58,37 +55,55 @@
* 门牌地址编码
*/
@ApiModelProperty(value = "门牌地址编码")
- private String buildingCode;
+ private String houseCode;
+
/**
- * 场所负责人（关联用户表信息）
+ * 楼栋编码
*/
- @ApiModelProperty(value = "场所负责人（关联用户表信息）")
+ @ApiModelProperty(value = "楼栋编码")
+ private String buildingCode;
+
+ /**
+ * 场所负责人（关联用户表信息user_id）
+ */
+ @ApiModelProperty(value = "场所负责人（关联用户表信息user_id）")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long principalUserId;
+
+ /**
+ * 场所负责人
+ */
+ @ApiModelProperty(value = "场所负责人")
+ @JsonSerialize(using = ToStringSerializer.class)
private String principal;
+
+ /**
+ * 场所负责人联系电话
+ */
+ @ApiModelProperty(value = "场所负责人联系电话")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String principalPhone;
+
/**
* 场所名称
*/
@ApiModelProperty(value = "场所名称")
private String placeName;
/**
- * 标签
- */
- @ApiModelProperty(value = "标签")
- private String label;
- /**
* 经度
*/
@ApiModelProperty(value = "经度")
- private BigDecimal lng;
+ private String lng;
/**
* 纬度
*/
@ApiModelProperty(value = "纬度")
- private BigDecimal lat;
+ private String lat;
/**
* 位置
*/
@ApiModelProperty(value = "位置")
- private String localtion;
+ private String location;
/**
* 场所照片
*/
@@ -96,10 +111,23 @@
private String imageUrls;
/**
+ * 网格id
+ */
+ @ApiModelProperty(value = "网格id")
+ private Integer gridId;
+
+ /**
+ * 来源 1：地址总表 2：国控采集 3：商超
+ */
+ @ApiModelProperty(value = "来源 1：地址总表 2：国控采集 3：商超")
+ private Integer source;
+
+ /**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
@@ -108,6 +136,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -115,6 +144,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
@@ -123,6 +153,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
--
Gitblit v1.9.3