From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/grid/entity/GridEntity.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/entity/GridEntity.java b/src/main/java/org/springblade/modules/grid/entity/GridEntity.java
index c957694..08c977c 100644
--- a/src/main/java/org/springblade/modules/grid/entity/GridEntity.java
+++ b/src/main/java/org/springblade/modules/grid/entity/GridEntity.java
@@ -16,10 +16,8 @@
*/
package org.springblade.modules.grid.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.alibaba.fastjson.support.geo.Geometry;
+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;
@@ -32,6 +30,7 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.modules.grid.handle.GeometryTypeHandler;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -44,6 +43,7 @@
@TableName("jczz_grid")
@ApiModel(value = "Grid对象", description = "网格表")
public class GridEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 主键
@@ -53,20 +53,26 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 社区名称
+ * 网格编号
*/
- @ApiModelProperty(value = "社区名称")
- private String communityName;
+ @ApiModelProperty(value = "网格编号")
+ private String gridCode;
+ /**
+ * 机构id
+ */
+ @ApiModelProperty(value = "机构id")
+ private Long deptId;
+ /**
+ * 社区编号
+ */
+ @ApiModelProperty(value = "社区编号")
+ private String communityCode;
+
/**
* 网格名称
*/
@ApiModelProperty(value = "网格名称")
private String gridName;
- /**
- * 负责人ID
- */
- @ApiModelProperty(value = "负责人ID")
- private Long userId;
/**
* 负责人名称
*/
@@ -79,15 +85,24 @@
private String principalPhone;
/**
* 网格面数据
+ * @TableField(typeHandler = GeometryTypeHandler.class) 操作面的时候用，平时注释掉
*/
@ApiModelProperty(value = "网格面数据")
+// @TableField(typeHandler = GeometryTypeHandler.class)
private String geom;
+
+ /**
+ * 排序
+ */
+ @ApiModelProperty(value = "排序")
+ private Integer sort;
/**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
@@ -96,6 +111,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;
/**
@@ -103,6 +119,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
@@ -111,12 +128,13 @@
@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;
/**
- * 备注
+ * 备注/简介
*/
- @ApiModelProperty(value = "备注")
+ @ApiModelProperty(value = "备注/简介")
private String remark;
/**
--
Gitblit v1.9.3