From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java | 205 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 140 insertions(+), 65 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java
index acbc3ed..2b76e68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java
@@ -3,70 +3,90 @@
import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
/**
- * 杞挱鍥�
- *
- * @author yj
+ * 杞挱鍥� 鍥剧墖绠＄悊
+ * @author Administrator
*
- * @date 2018骞�10鏈�15鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_swiper_banner_picture")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_swiper_banner_picture")
-public class SwiperPicture implements Serializable{
-
- private static final long serialVersionUID = 1L;
+@Table("yeshi_ec_swiper_banner_picture")
+public class SwiperPicture implements Serializable {
+ private static final long serialVersionUID = 1L;
- @Id
+ @Expose
@Column(name = "pic_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "pic_id")
private Long id;
-
- @JoinColumn(name = "pic_banner_id")
- @org.yeshi.utils.mybatis.Column(name = "pic_banner_id")
- private Long bannerId;// 绠＄悊id
-
- @JoinColumn(name = "pic_src")
- @org.yeshi.utils.mybatis.Column(name = "pic_src")
- private String src;// 鍥剧墖鍦板潃
+ // 杞挱鍥炬爣璇咺D
+ @Column(name = "pic_banner_id")
+ private Long bannerId;
- @JoinColumn(name = "pic_link")
- @org.yeshi.utils.mybatis.Column(name = "pic_link")
- private String link; // 璺宠浆鍦板潃
-
- @JoinColumn(name = "pic_order")
- @org.yeshi.utils.mybatis.Column(name = "pic_order")
- private Integer order; // 鎺掑簭
-
- @JoinColumn(name = "pic_remark")
- @org.yeshi.utils.mybatis.Column(name = "pic_remark")
- private String remark; // 澶囨敞
+ // 鍥剧墖閾炬帴
+ @Expose
+ @Column(name = "pic_src")
+ private String src;
- @JoinColumn(name = "pic_state")
- @org.yeshi.utils.mybatis.Column(name = "pic_state")
- private Integer state; // 鐘舵�侊細 1 鍋滅敤 0鍚敤
+ // 璺宠浆鏂瑰紡
+ @Expose
+ @Column(name = "pic_jumpid")
+ private JumpDetailV2 jumpDetail;
- @JoinColumn(name = "pic_createtime")
- @org.yeshi.utils.mybatis.Column(name = "pic_createtime")
- private Date createtime; // 鍒涘缓鏃堕棿
+ // 璺宠浆鍙傛暟
+ @Expose
+ @Column(name = "pic_params")
+ private String params;
+
+ // 璺宠浆鏄惁闇�瑕佺櫥闄�
+ @Column(name = "pic_jump_need_login")
+ private boolean jumpNeedLogin;
+
+ // 鎺掑簭
+ @Column(name = "pic_order")
+ private Integer order;
- @JoinColumn(name = "pic_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "pic_updatetime")
- private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
+ @Column(name = "pic_remark")
+ private String remark;
+ // 鍚敤鐘舵�� 0 鍚敤1 鍋滅敤
+ @Column(name = "pic_state")
+ private Integer state;
+
+ // 鑷姩鎺у埗
+ @Column(name = "pic_auto_control")
+ private Integer autoControl;
+
+ // 璧峰鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "pic_start_time")
+ private Date startTime;
+
+ // 缁撴潫鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "pic_end_time")
+ private Date endTime;
+
+ @Column(name = "pic_createtime")
+ private Date createtime;
+
+ @Column(name = "pic_updatetime")
+ private Date updatetime;
+
+
+ // 璧峰鏃堕棿
+ private String startTime_str;
+ // 缁撴潫鏃堕棿
+ private String endTime_str;
+
+
public Long getId() {
- return id;
+ return this.id;
}
public void setId(Long id) {
@@ -74,7 +94,7 @@
}
public Long getBannerId() {
- return bannerId;
+ return this.bannerId;
}
public void setBannerId(Long bannerId) {
@@ -82,23 +102,15 @@
}
public String getSrc() {
- return src;
+ return this.src;
}
public void setSrc(String src) {
this.src = src;
}
- public String getLink() {
- return link;
- }
-
- public void setLink(String link) {
- this.link = link;
- }
-
public String getRemark() {
- return remark;
+ return this.remark;
}
public void setRemark(String remark) {
@@ -106,7 +118,7 @@
}
public Integer getState() {
- return state;
+ return this.state;
}
public void setState(Integer state) {
@@ -114,7 +126,7 @@
}
public Date getCreatetime() {
- return createtime;
+ return this.createtime;
}
public void setCreatetime(Date createtime) {
@@ -122,7 +134,7 @@
}
public Date getUpdatetime() {
- return updatetime;
+ return this.updatetime;
}
public void setUpdatetime(Date updatetime) {
@@ -130,11 +142,74 @@
}
public Integer getOrder() {
- return order;
+ return this.order;
}
public void setOrder(Integer order) {
this.order = order;
}
-}
+ public JumpDetailV2 getJumpDetail() {
+ return this.jumpDetail;
+ }
+
+ public void setJumpDetail(JumpDetailV2 jumpDetail) {
+ this.jumpDetail = jumpDetail;
+ }
+
+ public String getParams() {
+ return this.params;
+ }
+
+ public void setParams(String params) {
+ this.params = params;
+ }
+
+ public Integer getAutoControl() {
+ return autoControl;
+ }
+
+ public void setAutoControl(Integer autoControl) {
+ this.autoControl = autoControl;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public boolean isJumpNeedLogin() {
+ return jumpNeedLogin;
+ }
+
+ public void setJumpNeedLogin(boolean jumpNeedLogin) {
+ this.jumpNeedLogin = jumpNeedLogin;
+ }
+
+ public String getStartTime_str() {
+ return startTime_str;
+ }
+
+ public void setStartTime_str(String startTime_str) {
+ this.startTime_str = startTime_str;
+ }
+
+ public String getEndTime_str() {
+ return endTime_str;
+ }
+
+ public void setEndTime_str(String endTime_str) {
+ this.endTime_str = endTime_str;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0