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/article/entity/Article.java |  172 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/entity/Article.java b/src/main/java/org/springblade/modules/article/entity/Article.java
index 17c227b..1caa9c3 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -2,12 +2,9 @@
 
 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;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotNull;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,120 +17,131 @@
 @TableName("jczz_article")
 public class Article implements Serializable {
 
-	/**
-	 * 主键id,自增
-	 */
-	@TableId(value = "id",type = IdType.AUTO)
+
+	/** 主键 */
+	@ApiModelProperty(value = "主键ID", example = "")
+	@TableId(value = "id", type = IdType.AUTO)
 	private Long id;
 
-	/**
-	 * 标题
-	 */
-//	@NotNull(message = "标题不能为空")
+	/** 标题 */
+	@ApiModelProperty(value = "标题", example = "")
+	@TableField("title")
 	private String title;
 
-	/**
-	 * 类型
-	 */
-//	@NotNull(message = "类型")
+	/** 类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查 5:业主大会 6:反诈宣传 */
+	@ApiModelProperty(value = "类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查 5:业主大会 6:反诈宣传", example = "")
+	@TableField("type")
 	private Integer type;
 
-	/**
-	 * 内容
-	 */
+	/** 内容 */
+	@ApiModelProperty(value = "内容", example = "")
+	@TableField("content")
 	private String content;
 
-	/**
-	 * logo 图片url
-	 */
+	/** logo 图片url */
+	@ApiModelProperty(value = "logo 图片url", example = "")
+	@TableField("url")
 	private String url;
 
-	/**
-	 * logo 图片url
-	 */
+	/** 视频url */
+	@ApiModelProperty(value = "视频url", example = "")
 	@TableField("video_url")
 	private String videoUrl;
 
-
-	/**
-	 * 发布来源id
-	 */
+	/** 发布来源id */
+	@ApiModelProperty(value = "发布来源id", example = "")
 	@TableField("source_id")
 	private String sourceId;
 
-	/**
-	 * 发布来源名称
-	 */
+	/** 发布来源名称 */
+	@ApiModelProperty(value = "发布来源名称", example = "")
 	@TableField("source_name")
 	private String sourceName;
 
-	/**
-	 * 资讯类型,对应业务字典数据 articleType
-	 */
+	/** 资讯类型 */
+	@ApiModelProperty(value = "资讯类型", example = "")
 	@TableField("article_type")
 	private String articleType;
 
-	/**
-	 * 是否推荐  1:推荐  2:不推荐
-	 */
-	private Integer recommend;
+	/** 资讯类型 */
+	@ApiModelProperty(value = "文章细类", example = "")
+	@TableField("article_subcategory")
+	private String articleSubcategory;
 
-	/**
-	 * 发布状态 0:未发布 1:已发布
-	 */
+	/** 是否推荐 1:推荐   2:不推荐 */
+	@ApiModelProperty(value = "是否推荐 1:推荐   2:不推荐", example = "")
+	@TableField("recommend")
+	private Byte recommend;
+
+	/** 是否发布 0:未发布 1:已发布 */
+	@ApiModelProperty(value = "是否发布 0:未发布 1:已发布", example = "")
+	@TableField("publish")
 	private String publish;
 
-	/**
-	 * 开启评论区 0:关闭 1:开启
-	 */
+	/** 是否开启评论 0:未开启 1:开启 */
+	@ApiModelProperty(value = "是否开启评论 0:未开启 1:开启", example = "")
+	@TableField("iscomment")
 	private String iscomment;
-	/**
-	 * 查看数量
-	 */
-	@ApiModelProperty(value = "查看数量")
+
+	/** 查看数量 */
+	@ApiModelProperty(value = "查看数量", example = "")
+	@TableField("view_number")
 	private Integer viewNumber;
 
+	/** 创建时间 */
+	@ApiModelProperty(value = "创建时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
+	private Date createTime;
 
-	/**
-	 * 创建人
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty("创建人")
+	/** 更新时间 */
+	@ApiModelProperty(value = "更新时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField(value = "update_time",fill = FieldFill.UPDATE)
+	private Date updateTime;
+
+	/** 更新人 */
+	@ApiModelProperty(value = "更新人", example = "")
+	@TableField("update_user")
+	private Long updateUser;
+
+	/** 创建人 */
+	@ApiModelProperty(value = "创建人", example = "")
+	@TableField("create_user")
 	private Long createUser;
 
 	/**
-	 * 创建时间
+	 * 是否删除 0:否  1:是
 	 */
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@ApiModelProperty("创建时间")
-	private Date createTime;
-
-	/**
-	 * 更新人
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty("更新人")
-	private Long updateUser;
-
-	/**
-	 * 更新时间
-	 */
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty("更新时间")
-	private Date updateTime;
-
-	/**
-	 * 是否删除
-	 */
-	@TableLogic
-	@ApiModelProperty("是否已删除 0:否  1:是")
+	@ApiModelProperty(value = "是否删除 0:否  1:是", example = "")
+	@TableField("is_deleted")
 	private Integer isDeleted;
 
-
-	/** 资讯范围 */
+	/**
+	 * 资讯范围
+	 */
 	@ApiModelProperty(value = "资讯范围", example = "")
 	@TableField("article_range")
 	private String articleRange;
+
+	/**
+	 * 楼栋
+	 */
+	@ApiModelProperty(value = "楼栋", example = "")
+	@TableField("building")
+	private String building;
+
+	/**
+	 * 单元
+	 */
+	@ApiModelProperty(value = "单元", example = "")
+	@TableField("unit")
+	private String unit;
+
+	@ApiModelProperty(value = "小区id", example = "")
+	@TableField("district_id")
+	private String districtId;
+
+	@ApiModelProperty(value = "分数", example = "")
+	private Integer score;
 }

--
Gitblit v1.9.3