增加方案ID

realtime/hologram-streaming/src/main/java/com/zhht/irn/entity/Cycle.java

 package com.zhht.irn.entity;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -10,28 +11,30 @@ import java.util.List;
 public class Cycle {
     // 周期编号
     private Long id;
-
     // 路口编号
     private String crossCode;
-
     //信控机编号
     private String signalCode;
-
     // 周期开始时间
     private String beginDateTime;
-
     // 周期结束时间
     private String endDateTime;
-
+    // 开始模式编码
+    private String beginControlModelCode;
+    // 结束模式编码
+    private String endControlModelCode;
+    // 开始方案ID
+    private Integer beginPlanId;
+    // 结束方案ID
+    private Integer endPlanId;
+    // 周期时长，单位 秒
     private int duration;
-
     // 周期序号
     private int cycleOrder;
     //绿信比
     private Double greenRatio;
     //损失时间
     private int lossTime;
-
     // 周期内相位列表（依次执行）
     private List<Stage> stageList;
 
@@ -114,4 +117,36 @@ public class Cycle {
     public void setSignalCode(String signalCode) {
         this.signalCode = signalCode;
     }
+
+    public String getBeginControlModelCode() {
+        return beginControlModelCode;
+    }
+
+    public void setBeginControlModelCode(String beginControlModelCode) {
+        this.beginControlModelCode = beginControlModelCode;
+    }
+
+    public String getEndControlModelCode() {
+        return endControlModelCode;
+    }
+
+    public void setEndControlModelCode(String endControlModelCode) {
+        this.endControlModelCode = endControlModelCode;
+    }
+
+    public Integer getBeginPlanId() {
+        return beginPlanId;
+    }
+
+    public void setBeginPlanId(Integer beginPlanId) {
+        this.beginPlanId = beginPlanId;
+    }
+
+    public Integer getEndPlanId() {
+        return endPlanId;
+    }
+
+    public void setEndPlanId(Integer endPlanId) {
+        this.endPlanId = endPlanId;
+    }
 }

realtime/hologram-streaming/src/main/java/com/zhht/irn/entity/Stage.java

@@ -14,29 +14,29 @@ public class Stage {
     // 相位编号
     private String phaseValue;
     // 相位开始时间
-    private String beginTime;
-
+    private Date beginDateTime;
     // 相位结束时间
-    private String endTime;
-
+    private Date endDateTime;
+    // 开始模式编码
+    private String beginControlModelCode;
+    // 结束模式编码
+    private String endControlModelCode;
+    // 开始方案ID
+    private Integer beginPlanId;
+    // 结束方案ID
+    private Integer endPlanId;
     // 相位持续时长
     private int duration;
-
     // 相位绿灯时间
     private int green;
-
     // 相位黄灯时间
     private int yellow;
-
     // 相位全红时间
     private int allRed;
-
     //相位序号
     private  int phaseOrder;
-
     // 阶段绿信比
     private Double greenRatio;
-
     // 阶段有效绿灯时长
     private int validGreen;
 
@@ -51,22 +51,6 @@ public class Stage {
         this.phaseValue = phaseValue;
     }
 
-    public String getBeginTime() {
-        return beginTime;
-    }
-
-    public void setBeginTime(String beginTime) {
-        this.beginTime = beginTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
     public int getDuration() {
         return duration;
     }
@@ -146,4 +130,52 @@ public class Stage {
     public void setLossTime(int lossTime) {
         this.lossTime = lossTime;
     }
+
+    public Date getBeginDateTime() {
+        return beginDateTime;
+    }
+
+    public void setBeginDateTime(Date beginDateTime) {
+        this.beginDateTime = beginDateTime;
+    }
+
+    public Date getEndDateTime() {
+        return endDateTime;
+    }
+
+    public void setEndDateTime(Date endDateTime) {
+        this.endDateTime = endDateTime;
+    }
+
+    public String getBeginControlModelCode() {
+        return beginControlModelCode;
+    }
+
+    public void setBeginControlModelCode(String beginControlModelCode) {
+        this.beginControlModelCode = beginControlModelCode;
+    }
+
+    public String getEndControlModelCode() {
+        return endControlModelCode;
+    }
+
+    public void setEndControlModelCode(String endControlModelCode) {
+        this.endControlModelCode = endControlModelCode;
+    }
+
+    public Integer getBeginPlanId() {
+        return beginPlanId;
+    }
+
+    public void setBeginPlanId(Integer beginPlanId) {
+        this.beginPlanId = beginPlanId;
+    }
+
+    public Integer getEndPlanId() {
+        return endPlanId;
+    }
+
+    public void setEndPlanId(Integer endPlanId) {
+        this.endPlanId = endPlanId;
+    }
 }