From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java | 163 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 121 insertions(+), 42 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java
index c29411b..313dd5e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java
@@ -2,18 +2,11 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
-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 javax.persistence.Transient;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
-import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.google.gson.annotations.Expose;
/**
* 瀵艰埅绠＄悊
@@ -22,15 +15,14 @@
*
* @date 2018骞�10鏈�23鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_home_navbar")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_home_navbar")
-public class HomeNavbar implements Serializable {
+@Table("yeshi_ec_home_navbar")
+public class HomeNavbar implements Serializable{
+ /**
+ *
+ */
private static final long serialVersionUID = 1L;
-
-
- // 娑堟伅绫诲瀷鐨勬灇涓�
+
public enum NavbarTypeEnum {
category("鍒嗙被"), weex("闃块噷鐧惧窛"), web("缃戦〉");
private final String desc;
@@ -45,55 +37,78 @@
}
- @Id
@Column(name = "br_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "br_id")
private Long id;
// 鍚嶇О
- @JoinColumn(name = "br_name")
- @org.yeshi.utils.mybatis.Column(name = "br_name")
+ @Expose
+ @Column(name = "br_name")
private String name;
// 鍥剧墖
- @JoinColumn(name = "br_picture")
- @org.yeshi.utils.mybatis.Column(name = "br_picture")
+ @Expose
+ @Column(name = "br_picture")
private String picture;
// 鍒嗙被id
- @JoinColumn(name = "br_class_id")
- @org.yeshi.utils.mybatis.Column(name = "br_class_id")
+ @Expose
+ @Column(name = "br_class_id")
private Long classId;
+ // 瀵瑰簲杞挱鍥炬爣璇�
+ @Expose
+ @Column(name = "br_swiper_banner_id")
+ private Long swiperBannerId;
+
// 璺宠浆閾炬帴
- @JoinColumn(name = "br_url")
- @org.yeshi.utils.mybatis.Column(name = "br_url")
+ @Expose
+ @Column(name = "br_url")
private String url;
// 绫诲瀷
- @JoinColumn(name = "br_type")
- @org.yeshi.utils.mybatis.Column(name = "br_type")
+ @Expose
+ @Column(name = "br_type")
private NavbarTypeEnum type;
// 鎺掑簭
- @JoinColumn(name = "br_orderby")
- @org.yeshi.utils.mybatis.Column(name = "br_orderby")
+ @Column(name = "br_orderby")
private Integer orderby;
+ //璧峰鏃堕棿
+ @Column(name = "br_start_time")
+ private Date startTime;
+
+ //缁撴潫鏃堕棿
+ @Column(name = "br_end_time")
+ private Date endTime;
+
+ // 鐘舵�侊細1鍚敤 0 鍋滅敤
+ @Column(name = "br_state")
+ private Integer state;
+
// 鍒涘缓鏃堕棿
- @JoinColumn(name = "br_createtime")
- @org.yeshi.utils.mybatis.Column(name = "br_createtime")
+ @Column(name = "br_createtime")
private Date createtime;
// 鏇存柊鏃堕棿
- @JoinColumn(name = "br_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "br_updatetime")
+ @Column(name = "br_updatetime")
private Date updatetime;
- @Transient // 绯荤粺鍏宠仈鍒楄〃
- private List<BusinessSystem> systemList;
+
+
+ // 鏄惁瀹氭椂
+ private boolean timeTask;
+ // 璧峰鏃堕棿
+ private String startTime_str;
+ // 缁撴潫鏃堕棿
+ private String endTime_str;
+ // 杞挱鍚嶅瓧
+ private String swiperName;
+ // 鍒嗙被鍚嶇О
+ private String className;
+
+
public Long getId() {
return id;
}
@@ -166,12 +181,76 @@
this.updatetime = updatetime;
}
- public List<BusinessSystem> getSystemList() {
- return systemList;
+ public Long getSwiperBannerId() {
+ return swiperBannerId;
}
- public void setSystemList(List<BusinessSystem> systemList) {
- this.systemList = systemList;
+ public void setSwiperBannerId(Long swiperBannerId) {
+ this.swiperBannerId = swiperBannerId;
+ }
+
+ 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 Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public boolean isTimeTask() {
+ return timeTask;
+ }
+
+ public void setTimeTask(boolean timeTask) {
+ this.timeTask = timeTask;
+ }
+
+ 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;
+ }
+
+ public String getSwiperName() {
+ return swiperName;
+ }
+
+ public void setSwiperName(String swiperName) {
+ this.swiperName = swiperName;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
}
}
--
Gitblit v1.8.0