From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java | 121 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 42 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
index a7481b9..6a688a1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
@@ -1,61 +1,98 @@
package com.panzhihua.common.model.vos.community;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
- * @description: 社区动态
+ * @description: 社区
* @author: huang.hongfa weixin hhf9596 qq 959656820
- * @create: 2020-12-07 14:04
+ * @create: 2020-12-15 10:06
**/
@Data
-@ApiModel("社区动态")
+@ApiModel("社区表")
public class ComActVO {
- /**
- * 自增id
- */
- private Long id;
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
- /**
- * 标题
- */
- private String title;
+ @ApiModelProperty("社区名字")
+ @NotBlank(groups = {AddGroup.class}, message = "社区名字不能为空")
+ private String name;
- /**
- * 阅读数
- */
- private Integer readNum;
+ @ApiModelProperty("社区地址")
+ @NotBlank(groups = {AddGroup.class}, message = "社区地址不能为空")
+ private String address;
- /**
- * 状态
- */
- private boolean status;
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lng;
- /**
- * 是否置顶
- */
- private String isTopping;
+ @ApiModelProperty("维度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
- /**
- * 发布时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date publishAt;
-
- /**
- * 创建时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
private Date createAt;
- /**
- * 修改时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateAt;
+ @ApiModelProperty("省份地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "省份地址编码不能为空")
+ private String provinceCode;
+
+ @ApiModelProperty("市级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "市级地址编码不能为空")
+ private String cityCode;
+
+ @ApiModelProperty("区级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "区级地址编码不能为空")
+ private String areaCode;
+
+ @ApiModelProperty("区级地址编码-名字")
+ private String areaName;
+
+ @ApiModelProperty("社区面积")
+ @Min(value = 1, groups = {AddGroup.class}, message = "社区面积不能为空")
+ private Double square;
+
+ @ApiModelProperty("联系人")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+ private String contacts;
+
+ @ApiModelProperty("联系人电话")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人电话不能为空")
+ private String contactsPhone;
+
+ @ApiModelProperty("超管账号")
+ @NotBlank(groups = {AddGroup.class}, message = "超管账号不能为空")
+ private String account;
+
+ @ApiModelProperty("账号密码")
+ @NotBlank(groups = {AddGroup.class}, message = "账号密码不能为空")
+ private String password;
+
+ @ApiModelProperty(value = "状态 0 启用 1 禁用", example = "0")
+ private Integer state;
+
+ @ApiModelProperty("距离-单位米")
+ private String distance;
+
+ @ApiModelProperty("街道Id")
+ private Long streetId;
+
+ @ApiModelProperty("行政区域")
+ private String administrativeRegions;
+
+ @ApiModelProperty("调解站电话")
+ private String solvePhone;
}
--
Gitblit v1.7.1