Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

潘钊
2 parents ce4f33f7 817d069b
Showing 4 changed files with 299 additions and 81 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlan.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/schedule/TTInfoDetail.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
@@ -26,19 +26,17 @@ public class SchedulePlan {
     /** 关联的时刻表/模版 */
     @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private TTInfo ttInfo;
-    /** 关联的排班规则 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    /** 关联的排班规则（这里暂时改成可以不关联规则，直接生成排班） */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private ScheduleRule1 scheduleRule1;
     /** 排班计划的开始时间 */
+    @Column(nullable = false)
     private Date scheduleFromTime;
     /** 排班计划的结束时间 */
+    @Column(nullable = false)
     private Date scheduleToTime;
-    /** 操作人 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser user;
-
     /** 使用中间表的一对多关联 明细信息 */
     @OneToMany(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     @JoinTable(
@@ -48,10 +46,16 @@ public class SchedulePlan {
     )
     private List<SchedulePlanInfo> schedulePlanInfoList;
-    // 创建日期
+    /** 创建人 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser updateBy;
+    /** 创建日期 */
     @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
     private Date createDate;
-    // 修改日期
+    /** 修改日期 */
     @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     private Date updateDate;
@@ -79,6 +83,14 @@ public class SchedulePlan {
         this.ttInfo = ttInfo;
     }
+    public ScheduleRule1 getScheduleRule1() {
+        return scheduleRule1;
+    }
+
+    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
+        this.scheduleRule1 = scheduleRule1;
+    }
+
     public Date getScheduleFromTime() {
         return scheduleFromTime;
     }
@@ -95,12 +107,28 @@ public class SchedulePlan {
         this.scheduleToTime = scheduleToTime;
     }
-    public SysUser getUser() {
-        return user;
+    public List<SchedulePlanInfo> getSchedulePlanInfoList() {
+        return schedulePlanInfoList;
     }
-    public void setUser(SysUser user) {
-        this.user = user;
+    public void setSchedulePlanInfoList(List<SchedulePlanInfo> schedulePlanInfoList) {
+        this.schedulePlanInfoList = schedulePlanInfoList;
+    }
+
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
     }
     public Date getCreateDate() {
@@ -115,14 +143,6 @@ public class SchedulePlan {
         return updateDate;
     }
-    public ScheduleRule1 getScheduleRule1() {
-        return scheduleRule1;
-    }
-
-    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
-        this.scheduleRule1 = scheduleRule1;
-    }
-
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
@@ -20,25 +20,47 @@ public class SchedulePlanInfo {
     private Long id;
     /** 排班计划日期 */
+    @Column(nullable = false)
     private Date scheduleDate;
-    /** 路牌名称 */
-    private String lpName;
-    /** 线路编码 */
-    private String xlBm;
+    /** 关联 bsth_c_line 主键，不做mapping */
+    @Column(nullable = false)
+    private Integer xl;
     /** 线路名称 */
+    @Column(nullable = false)
     private String xlName;
+    /** 线路编码 */
+    @Column(nullable = false)
+    private String xlBm;
+
+    /** 关联 bsth_c_s_gbi 主键，不做mapping */
+    @Column(nullable = false)
+    private Long lp;
+    /** 路牌名称 */
+    @Column(nullable = false)
+    private String lpName;
+
+    /** 关联 bsth_c_cars 主键，不做mapping */
+    @Column(nullable = false)
+    private Integer cl;
     /** 车辆自编号 */
+    @Column(nullable = false)
     private String clZbh;
     /** 报道1时间（格式 HH:mm） */
     private String bd1Time;
     /** 出场1时间（格式 HH:mm） */
+    @Column(nullable = false)
     private String cc1Time;
+    /** 关联 bsth_c_personnel 主键，不做mapping */
+    @Column(nullable = false)
+    private Integer j1;
     /** 驾驶员1工号 */
+    @Column(nullable = false)
     private String j1Gh;
     /** 驾驶员1名字 */
+    @Column(nullable = false)
     private String j1Name;
     /** 售票员1工号 */
     private String s1Gh;
@@ -58,32 +80,73 @@ public class SchedulePlanInfo {
     /** 售票员2名字 */
     private String s2Name;
-    // 冗余的时刻明细信息
-    /** 线路方向 */
+    // 上面的暂时保留，之后删除
+    /** 报道时间（格式 HH:mm） */
+    @Column(nullable = false)
+    private String bdTime;
+    /** 出场时间（格式 HH:mm） */
+    @Column(nullable = false)
+    private String ccTime;
+    /** 驾驶员工号 */
+    @Column(nullable = false)
+    private String jGh;
+    /** 驾驶员名字 */
+    @Column(nullable = false)
+    private String jName;
+    /** 售票员2工号 */
+    private String sGh;
+    /** 售票员2名字 */
+    private String sName;
+
+    // 冗余的时刻明细信息，不做mapping
+    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
+    @Column(nullable = false)
     private String xlDir;
-    /** 起点站名称 */
-    private String qdz;
-    /** 终点站名称 */
-    private String zdz;
+    /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
+    @Column(nullable = false)
+    private Integer qdz;
+    /** 起点站名字 */
+    @Column(nullable = false)
+    private String qdzName;
+    /** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
+    @Column(nullable = false)
+    private Integer zdz;
+    /** 终点站名字 */
+    @Column(nullable = false)
+    private String zdzName;
+
     /** 发车时间（格式 HH:mm） */
+    @Column(nullable = false)
     private String fcsj;
     /** 发车顺序号 */
-    private int fcno;
+    @Column(nullable = false)
+    private Integer fcno;
     /** 对应班次数 */
-    private int bcs;
+    @Column(nullable = false)
+    private Integer bcs;
     /** 计划里程 */
-    private double jhlc;
+    private Double jhlc;
     /** 班次历时 */
-    private int bcsj;
-
-    /** 操作人 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser user;
-
-    // 创建日期
+    private Integer bcsj;
+
+    /**
+     * 班次类型
+     * TODO：正常班次、出场、进场、加油、临加班次、区间班次、放空班次、放大站班次、两点间空驶
+     * TODO：这个以后用枚举还是字典再议，现在先用文字
+     */
+    @Column(nullable = false)
+    private String bcType;
+
+    /** 创建人 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser updateBy;
+    /** 创建日期 */
     @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
     private Date createDate;
-    // 修改日期
+    /** 修改日期 */
     @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     private Date updateDate;
@@ -103,12 +166,12 @@ public class SchedulePlanInfo {
         this.scheduleDate = scheduleDate;
     }
-    public String getLpName() {
-        return lpName;
+    public Integer getXl() {
+        return xl;
     }
-    public void setLpName(String lpName) {
-        this.lpName = lpName;
+    public void setXl(Integer xl) {
+        this.xl = xl;
     }
     public String getXlName() {
@@ -119,6 +182,38 @@ public class SchedulePlanInfo {
         this.xlName = xlName;
     }
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+
+    public Long getLp() {
+        return lp;
+    }
+
+    public void setLp(Long lp) {
+        this.lp = lp;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public Integer getCl() {
+        return cl;
+    }
+
+    public void setCl(Integer cl) {
+        this.cl = cl;
+    }
+
     public String getClZbh() {
         return clZbh;
     }
@@ -127,6 +222,14 @@ public class SchedulePlanInfo {
         this.clZbh = clZbh;
     }
+    public String getBd1Time() {
+        return bd1Time;
+    }
+
+    public void setBd1Time(String bd1Time) {
+        this.bd1Time = bd1Time;
+    }
+
     public String getCc1Time() {
         return cc1Time;
     }
@@ -135,6 +238,14 @@ public class SchedulePlanInfo {
         this.cc1Time = cc1Time;
     }
+    public Integer getJ1() {
+        return j1;
+    }
+
+    public void setJ1(Integer j1) {
+        this.j1 = j1;
+    }
+
     public String getJ1Gh() {
         return j1Gh;
     }
@@ -167,14 +278,6 @@ public class SchedulePlanInfo {
         this.s1Name = s1Name;
     }
-    public String getBd1Time() {
-        return bd1Time;
-    }
-
-    public void setBd1Time(String bd1Time) {
-        this.bd1Time = bd1Time;
-    }
-
     public String getBd2Time() {
         return bd2Time;
     }
@@ -231,22 +334,38 @@ public class SchedulePlanInfo {
         this.xlDir = xlDir;
     }
-    public String getQdz() {
+    public Integer getQdz() {
         return qdz;
     }
-    public void setQdz(String qdz) {
+    public void setQdz(Integer qdz) {
         this.qdz = qdz;
     }
-    public String getZdz() {
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public Integer getZdz() {
         return zdz;
     }
-    public void setZdz(String zdz) {
+    public void setZdz(Integer zdz) {
         this.zdz = zdz;
     }
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
     public String getFcsj() {
         return fcsj;
     }
@@ -255,12 +374,60 @@ public class SchedulePlanInfo {
         this.fcsj = fcsj;
     }
-    public SysUser getUser() {
-        return user;
+    public Integer getFcno() {
+        return fcno;
+    }
+
+    public void setFcno(Integer fcno) {
+        this.fcno = fcno;
+    }
+
+    public Integer getBcs() {
+        return bcs;
+    }
+
+    public void setBcs(Integer bcs) {
+        this.bcs = bcs;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public Integer getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(Integer bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
     }
-    public void setUser(SysUser user) {
-        this.user = user;
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
     }
     public Date getCreateDate() {
@@ -279,43 +446,51 @@ public class SchedulePlanInfo {
         this.updateDate = updateDate;
     }
-    public int getFcno() {
-        return fcno;
+    public String getBdTime() {
+        return bdTime;
     }
-    public void setFcno(int fcno) {
-        this.fcno = fcno;
+    public void setBdTime(String bdTime) {
+        this.bdTime = bdTime;
     }
-    public int getBcs() {
-        return bcs;
+    public String getCcTime() {
+        return ccTime;
     }
-    public void setBcs(int bcs) {
-        this.bcs = bcs;
+    public void setCcTime(String ccTime) {
+        this.ccTime = ccTime;
     }
-    public double getJhlc() {
-        return jhlc;
+    public String getjGh() {
+        return jGh;
     }
-    public void setJhlc(double jhlc) {
-        this.jhlc = jhlc;
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
     }
-    public int getBcsj() {
-        return bcsj;
+    public String getjName() {
+        return jName;
     }
-    public void setBcsj(int bcsj) {
-        this.bcsj = bcsj;
+    public void setjName(String jName) {
+        this.jName = jName;
     }
-    public String getXlBm() {
-        return xlBm;
+    public String getsGh() {
+        return sGh;
     }
-    public void setXlBm(String xlBm) {
-        this.xlBm = xlBm;
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
     }
 }
@@ -66,6 +66,9 @@ public class TTInfoDetail {
     @Column(nullable = false)
     private String bcType;
+    /** 是否分班（表示这个班次是否是晚班班次，就是换另外一个驾驶员开）*/
+    private Boolean isFB;
+
     /** 是否切换线路 */
     private Boolean isSwitchXl;
     /** 切换的线路（isSwitchXl == true） */
@@ -265,4 +268,12 @@ public class TTInfoDetail {
     public void setTcc(CarPark tcc) {
         this.tcc = tcc;
     }
+
+    public Boolean getIsFB() {
+        return isFB;
+    }
+
+    public void setIsFB(Boolean isFB) {
+        this.isFB = isFB;
+    }
 }
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 16/6/6.
+ */
+@Repository
+public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanInfo, Long> {
+}