From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/place/entity/PlaceEntity.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 94 insertions(+), 10 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 a1e723a..a8970c8 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,12 +55,41 @@
* 门牌地址编码
*/
@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 = "场所负责人身份证号", example = "")
+ @TableField("principal_id_card")
+ private String principalIdCard;
+
+ /**
+ * 场所负责人联系电话
+ */
+ @ApiModelProperty(value = "场所负责人联系电话")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String principalPhone;
+
/**
* 场所名称
*/
@@ -73,17 +99,17 @@
* 经度
*/
@ApiModelProperty(value = "经度")
- private BigDecimal lng;
+ private String lng;
/**
* 纬度
*/
@ApiModelProperty(value = "纬度")
- private BigDecimal lat;
+ private String lat;
/**
* 位置
*/
@ApiModelProperty(value = "位置")
- private String localtion;
+ private String location;
/**
* 场所照片
*/
@@ -91,10 +117,65 @@
private String imageUrls;
/**
+ * 网格编号
+ */
+ @ApiModelProperty(value = "网格编号")
+ private String gridCode;
+
+ /**
+ * 警务网格编号
+ */
+ @ApiModelProperty(value = "警务网格编号")
+ private String jwGridCode;
+
+ /**
+ * 状态 1：待完善 2：已完善
+ */
+ @ApiModelProperty(value = "状态 1：待完善 2：已完善")
+ private Integer status;
+
+ /**
+ * 来源 1：地址总表 2：国控采集 3：商超
+ */
+ @ApiModelProperty(value = "来源 1：地址总表 2：国控采集 3：商超")
+ private Integer source;
+
+ /**
+ * 是否现场采集 1：是 2：否
+ */
+ @ApiModelProperty(value = "是否现场采集 1：是 2：否")
+ private Integer isScene;
+
+ /**
+ * 是否九小场所 1：是 2：否
+ */
+ @ApiModelProperty(value = "是否九小场所 1：是 2：否")
+ private Integer isNine;
+
+ /**
+ * 九小场所类型 字典 nineType
+ */
+ @ApiModelProperty(value = "九小场所类型")
+ private Integer nineType;
+
+ /**
+ * 是否阵地 1：是 2：否
+ */
+ @ApiModelProperty(value = "是否阵地 1：是 2：否")
+ private Integer isFront;
+
+ /**
+ * 阵地类型 字典 frontType
+ */
+ @ApiModelProperty(value = "阵地类型")
+ private Integer frontType;
+
+ /**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
@@ -103,6 +184,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;
/**
@@ -110,6 +192,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
@@ -118,6 +201,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