update...

panzhaov5
1 parent 5d90b218
Showing 8 changed files with 451 additions and 4 deletions
src/main/java/com/bsth/data/schedule/edit_logs/entity/SchEditInfo.java
src/main/java/com/bsth/data/schedule/taopao/TaoPaoDataBuffer.java
src/main/java/com/bsth/data/schedule/taopao/entity/CLTaoPaoInfo.java
src/main/java/com/bsth/data/schedule/taopao/entity/TPCutRealSchedule.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/line_schedule/layout.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -165,7 +165,13 @@ public class SchEditInfo {
         long t = System.currentTimeMillis();
         sei.setTs(t);
         sei.setTimeStr(fmtHHmm.print(t));
-        sei.setUser(userId);
+        if(null != userId)
+            sei.setUser(userId);
+        else{
+            SysUser user = SecurityUtils.getCurrentUser();
+            if(user != null)
+                sei.setUser(user.getUserName());
+        }
         sei.setRq(sch.getScheduleDateStr());
         sei.setSchId(sch.getId());
         sei.setLineCode(sch.getXlBm());
+package com.bsth.data.schedule.taopao;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.taopao.entity.CLTaoPaoInfo;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 实际班次套跑信息
+ */
+@Component
+public class TaoPaoDataBuffer {
+
+    /**
+     * 线路编码 ——> 套跑信息
+     */
+    private static ArrayListMultimap<String, CLTaoPaoInfo> multimap;
+
+    static {
+        multimap = ArrayListMultimap.create();
+    }
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+}
+package com.bsth.data.schedule.taopao.entity;
+
+/**
+ * 车辆套跑 信息
+ */
+public class CLTaoPaoInfo {
+
+    private String lineCode;
+
+    private String nbbm;
+
+    /**
+     * 班次ID , 号分割多个
+     */
+    private String schIdx;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getSchIdx() {
+        return schIdx;
+    }
+
+    public void setSchIdx(String schIdx) {
+        this.schIdx = schIdx;
+    }
+}
+package com.bsth.data.schedule.taopao.entity;
+
+import javax.persistence.Transient;
+
+/**
+ * 精简的班次信息（展示套跑信息用）
+ */
+public class TPCutRealSchedule {
+
+    /** 主键Id */
+    private Long id;
+
+    /** 排班日期字符串 YYYY-MM-DD */
+    private String scheduleDateStr;
+
+    /** 路牌名称 */
+    private String lpName;
+
+    /** 车辆自编号 */
+    private String clZbh;
+
+    /** 驾驶员工号 */
+    private String jGh;
+    /** 驾驶员名字 */
+    private String jName;
+    /** 售票员工号 */
+    private String sGh;
+    /** 售票员名字 */
+    private String sName;
+
+    /** 线路方向 */
+    private String xlDir;
+    /** 起点站名字 */
+    private String qdzName;
+
+    /** 终点站名字 */
+    private String zdzName;
+
+    /** 计划发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 计划发车时间戳*/
+    @Transient
+    private Long fcsjT;
+
+    /** 计划终点时间（格式 HH:mm） */
+    private String zdsj;
+    /** 计划终点时间戳*/
+    @Transient
+    private Long zdsjT;
+
+    /** 计划里程 */
+    private Double jhlc;
+
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /**
+     * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
+     */
+    private String bcType;
+
+    //放站班次 站点名称
+    private String majorStationName;
+
+    /** 实际发车时间*/
+    private String fcsjActual;
+    /**实际终点时间 */
+    private String zdsjActual;
+
+    /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
+    private int status;
+
+    private String adjustExps;
+
+    /** 是否是临加班次 */
+    private boolean sflj;
+
+    /** 备注*/
+    private String remarks;
+
+    /**待发时间（格式 HH:mm） */
+    private String dfsj;
+
+    /**待发时间戳 */
+    @Transient
+    private Long dfsjT;
+
+    /** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
+    private Integer directiveState = -1;
+
+    /** 起点站计划到达时间 */
+    @Transient
+    private String qdzArrDatejh;
+
+    /** 起点站实际到达时间 */
+    @Transient
+    private String qdzArrDatesj;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getScheduleDateStr() {
+        return scheduleDateStr;
+    }
+
+    public void setScheduleDateStr(String scheduleDateStr) {
+        this.scheduleDateStr = scheduleDateStr;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Long getFcsjT() {
+        return fcsjT;
+    }
+
+    public void setFcsjT(Long fcsjT) {
+        this.fcsjT = fcsjT;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public Long getZdsjT() {
+        return zdsjT;
+    }
+
+    public void setZdsjT(Long zdsjT) {
+        this.zdsjT = zdsjT;
+    }
+
+    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 String getMajorStationName() {
+        return majorStationName;
+    }
+
+    public void setMajorStationName(String majorStationName) {
+        this.majorStationName = majorStationName;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getAdjustExps() {
+        return adjustExps;
+    }
+
+    public void setAdjustExps(String adjustExps) {
+        this.adjustExps = adjustExps;
+    }
+
+    public boolean isSflj() {
+        return sflj;
+    }
+
+    public void setSflj(boolean sflj) {
+        this.sflj = sflj;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public Long getDfsjT() {
+        return dfsjT;
+    }
+
+    public void setDfsjT(Long dfsjT) {
+        this.dfsjT = dfsjT;
+    }
+
+    public Integer getDirectiveState() {
+        return directiveState;
+    }
+
+    public void setDirectiveState(Integer directiveState) {
+        this.directiveState = directiveState;
+    }
+
+    public String getQdzArrDatejh() {
+        return qdzArrDatejh;
+    }
+
+    public void setQdzArrDatejh(String qdzArrDatejh) {
+        this.qdzArrDatejh = qdzArrDatejh;
+    }
+
+    public String getQdzArrDatesj() {
+        return qdzArrDatesj;
+    }
+
+    public void setQdzArrDatesj(String qdzArrDatesj) {
+        this.qdzArrDatesj = qdzArrDatesj;
+    }
+}
@@ -2076,4 +2076,9 @@ dl.active &gt; dd.disabled {
  
 .warn_multi_station:hover{
     background: #f8f81e;
+}
+
+.tp_info_icon{
+    font-size: 14px;
+    cursor: pointer;
 }
 \ No newline at end of file
@@ -24,6 +24,8 @@
                     </div>
                 </div>
                 <i class="uk-icon-eye uk-icon-hover ct_eye_icon"></i>
+                <!--<i class="uk-icon-share-alt uk-icon-hover tp_info_icon" ></i>-->
+
                 <span class="warn_multi_station" data-updown="{{dir}}" data-code="{{line.lineCode}}"></span>
                 <div class="search_sch_panel">
                     <form class="uk-form" onsubmit="javascript:return false;">
@@ -64,8 +64,6 @@ var gb_line_layout = (function() {
                     var lineCode = $(this).data('code')
                         ,updown = $(this).data('updown')
                         ,list = gb_schedule_table.findSCodeErrorInfo(lineCode, updown);
-                    //console.log('this', this);
-                    //var data = gb_schedule_table.findSCodeErrorInfo();
                     return temps['sch-table-m_station_error-temp']({list: list});
                 }
             },
@@ -90,6 +88,38 @@ var gb_line_layout = (function() {
         });
     });
  
+
+    $(document).on('mouseenter', '.schedule-wrap .header-title i.tp_info_icon', function() {
+        $(this).qtip({
+            show: {
+                ready: true,
+                delay: 200
+            },
+            content: {
+                text: '点击展开车辆套跑信息'
+            },
+            position: {
+                viewport: $(window),
+                my: 'bottom center',
+                at: 'top center'
+            },
+            style: {
+                classes: 'qtip-rounded qtip-shadow '
+            },
+            hide: {
+                fixed: true,
+                delay: 300
+            },
+            events: {
+                hidden: function(event, api) {
+                    //destroy dom
+                    $(this).qtip('destroy', true);
+                }
+            }
+        });
+    });
+
+
     return {
         layout: layout
     };
@@ -837,7 +837,7 @@ var gb_schedule_table = (function () {
                 continue;
  
             $(".schedule-wrap span.warn_multi_station[data-updown="+(k.split('_')[1])+"]", wrap)
-                .html('班次站点编码与实际不符！！！').show();
+                .html('o(*￣▽￣*)o 班次站点编码有点问题！！').show();
         }
  
         errorCodeData = data;