Change entity

AutismSuperman · Sep 5, 2019 · 3320dec · 3320dec
1 parent 01af119
commit 3320dec
Show file tree

Hide file tree

Showing 12 changed files with 2,038 additions and 52 deletions.
diff --git a/doc/initData/t_sys_file_info.sql b/doc/initData/t_sys_file_info.sql
diff --git a/flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/Activity.java b/flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/Activity.java
@@ -1,6 +1,7 @@
 package cn.enilu.flash.bean.entity.front;
 
-import lombok.Data;
+import com.alibaba.fastjson.annotation.JSONField;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
@@ -9,14 +10,69 @@
  * @author zt
  */
 @Document(collection = "activities")
-@Data
 public class Activity extends BaseMongoEntity {
-
+    @Id
+    private String _id;
     private Long id;
     private String name;
     private String description;
     private String icon_color;
     private String icon_name;
     private Integer ranking_weight;
+    //必须在setget方法加上该注释，否则_id值会覆盖在id上
+    @JSONField(name="_id")
+    public String get_id() {
+        return _id;
+    }
+    @JSONField(name="_id")
+    public void set_id(String _id) {
+        this._id = _id;
+    }
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getIcon_color() {
+        return icon_color;
+    }
+
+    public void setIcon_color(String icon_color) {
+        this.icon_color = icon_color;
+    }
+
+    public String getIcon_name() {
+        return icon_name;
+    }
+
+    public void setIcon_name(String icon_name) {
+        this.icon_name = icon_name;
+    }
+
+    public Integer getRanking_weight() {
+        return ranking_weight;
+    }
 
+    public void setRanking_weight(Integer ranking_weight) {
+        this.ranking_weight = ranking_weight;
+    }
 }
diff --git a/flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/Address.java b/flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/Address.java
@@ -1,6 +1,7 @@
 package cn.enilu.flash.bean.entity.front;
 
-import lombok.Data;
+import com.alibaba.fastjson.annotation.JSONField;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
@@ -12,9 +13,9 @@
  * @author zt
  */
 @Document(collection = "addresses")
-@Data
-public class Address extends BaseMongoEntity {
-
+public class Address extends BaseMongoEntity{
+    @Id
+    private String _id;
     private Long id;
     private String address;
     private String phone;
@@ -35,5 +36,173 @@ public class Address extends BaseMongoEntity {
     private Integer poi_type;
     private Date created_at;
     private Integer is_valid;
+    //必须在setget方法加上该注释，否则_id值会覆盖在id上
+    @JSONField(name="_id")
+    public String get_id() {
+        return _id;
+    }
+    @JSONField(name="_id")
+    public void set_id(String _id) {
+        this._id = _id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getPhone_bk() {
+        return phone_bk;
+    }
+
+    public void setPhone_bk(String phone_bk) {
+        this.phone_bk = phone_bk;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSt_geohash() {
+        return st_geohash;
+    }
+
+    public void setSt_geohash(String st_geohash) {
+        this.st_geohash = st_geohash;
+    }
+
+    public String getAddress_detail() {
+        return address_detail;
+    }
+
+    public void setAddress_detail(String address_detail) {
+        this.address_detail = address_detail;
+    }
+
+    public Integer getTag_type() {
+        return tag_type;
+    }
+
+    public void setTag_type(Integer tag_type) {
+        this.tag_type = tag_type;
+    }
+
+    public Long getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(Long user_id) {
+        this.user_id = user_id;
+    }
+
+    public Boolean getPhone_had_bound() {
+        return phone_had_bound;
+    }
+
+    public void setPhone_had_bound(Boolean phone_had_bound) {
+        this.phone_had_bound = phone_had_bound;
+    }
+
+    public Integer getDeliver_amount() {
+        return deliver_amount;
+    }
+
+    public void setDeliver_amount(Integer deliver_amount) {
+        this.deliver_amount = deliver_amount;
+    }
+
+    public Integer getAgent_fee() {
+        return agent_fee;
+    }
+
+    public void setAgent_fee(Integer agent_fee) {
+        this.agent_fee = agent_fee;
+    }
+
+    public Boolean getIs_deliverable() {
+        return is_deliverable;
+    }
+
+    public void setIs_deliverable(Boolean is_deliverable) {
+        this.is_deliverable = is_deliverable;
+    }
+
+    public Boolean getIs_user_default() {
+        return is_user_default;
+    }
+
+    public void setIs_user_default(Boolean is_user_default) {
+        this.is_user_default = is_user_default;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public Integer getCity_id() {
+        return city_id;
+    }
+
+    public void setCity_id(Integer city_id) {
+        this.city_id = city_id;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public Integer getPoi_type() {
+        return poi_type;
+    }
+
+    public void setPoi_type(Integer poi_type) {
+        this.poi_type = poi_type;
+    }
+
+    public Date getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(Date created_at) {
+        this.created_at = created_at;
+    }
+
+    public Integer getIs_valid() {
+        return is_valid;
+    }
 
+    public void setIs_valid(Integer is_valid) {
+        this.is_valid = is_valid;
+    }
 }
diff --git a/flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/Admin.java b/flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/Admin.java
@@ -1,15 +1,16 @@
 package cn.enilu.flash.bean.entity.front;
 
-import lombok.Data;
+import com.alibaba.fastjson.annotation.JSONField;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * Created by zt on 2017/12/29 0029.
  */
 @Document(collection = "admins")
-@Data
-public class Admin extends BaseMongoEntity {
-
+public class Admin extends BaseMongoEntity{
+    @Id
+    private String _id;
     private Long id;
     private String user_name;
     private String password;
@@ -19,4 +20,76 @@ public class Admin extends BaseMongoEntity {
     private String avatar;
     private String admin;
 
+    //必须在setget方法加上该注释，否则_id值会覆盖在id上
+    @JSONField(name="_id")
+    public String get_id() {
+        return _id;
+    }
+    @JSONField(name="_id")
+    public void set_id(String _id) {
+        this._id = _id;
+    }
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUser_name() {
+        return user_name;
+    }
+
+    public void setUser_name(String user_name) {
+        this.user_name = user_name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getCreate_time() {
+        return create_time;
+    }
+
+    public void setCreate_time(String create_time) {
+        this.create_time = create_time;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getAdmin() {
+        return admin;
+    }
+
+    public void setAdmin(String admin) {
+        this.admin = admin;
+    }
 }