Merge branch 'minhang' into pudong

潘钊
2 parents a8acb299 e6014c28
Showing 17 changed files with 476 additions and 161 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/summary/DestroySituationController.java
src/main/java/com/bsth/data/schedule/auto_exec/AutoExecScanThread.java
src/main/java/com/bsth/data/schedule/auto_exec/RealScheduleAutoExecHandler.java
src/main/java/com/bsth/data/summary/entity/DestroySituation.java
src/main/java/com/bsth/data/summary/repository/DestroySituationRepository.java
src/main/java/com/bsth/data/summary/service/DestroySituationService.java
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/resources/static/pages/summary/destory_sch_detail/list.html
src/main/resources/static/pages/summary/work_hours/list.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
@@ -9,6 +9,7 @@ import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.signal.SchSiginUpdateDBThread;
@@ -64,6 +65,8 @@ public class XDApplication implements CommandLineRunner {
     SampleTimeDataLoader sampleTimeDataLoader;
     @Autowired
     SchSiginUpdateDBThread schSiginUpdateDBThread;
+    @Autowired
+    AutoExecScanThread autoExecScanThread;
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -111,6 +114,8 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
+        //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -137,6 +142,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
+        sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行
         DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
@@ -116,4 +116,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> parkAndStationSet(@RequestParam Map<String, String> map){
 		return lineConfigService.parkAndStationSet(map);
 	}
+
+	@RequestMapping(value = "/setAutoExec", method = RequestMethod.POST)
+	public Map<String, Object> setAutoExec(@RequestParam Map<String, String> map){
+		return lineConfigService.setAutoExec(map);
+	}
 }
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.DestroySituation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@RestController
+@RequestMapping("/summary/destroy_detail")
+public class DestroySituationController extends BaseController<DestroySituation, Long> {
+}
+package com.bsth.data.schedule.auto_exec;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 班次自动执行扫描线程
+ * Created by panzhao on 2017/10/31.
+ */
+@Component
+public class AutoExecScanThread extends Thread{
+
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    RealScheduleAutoExecHandler realScheduleAutoExecHandler;
+
+    @Override
+    public void run() {
+        //要自动执行的线路
+        List<String> autos = new ArrayList<>();
+        Collection<LineConfig> lcs = lineConfigData.getAll();
+
+        for(LineConfig config : lcs){
+            if(config.isAutoExec()){
+                autos.add(config.getLine().getLineCode());
+            }
+        }
+
+        if(autos.size()==0)
+            return;
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+        for(ScheduleRealInfo sch : all){
+            if(autos.contains(sch.getXlBm())){
+                realScheduleAutoExecHandler.exec(sch);
+            }
+        }
+    }
+}
+package com.bsth.data.schedule.auto_exec;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 实际班次自动执行
+ * Created by panzhao on 2017/10/31.
+ */
+@Component
+public class RealScheduleAutoExecHandler {
+
+    @Autowired
+    SendUtils sendUtils;
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+
+    public void exec(ScheduleRealInfo sch) {
+        boolean flag = false;
+        long t = System.currentTimeMillis();
+
+        if (sch.getDfsjT() < t) {
+            sch.setFcsjActualAll(sch.getDfsjT());
+            flag = true;
+        }
+
+        if (sch.getZdsjT() < t) {
+            sch.setZdsjActualAll(sch.getZdsjT());
+            ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
+            if (null != next) {
+                next.setQdzArrDatesj(sch.getZdsjActual());
+
+                List<ScheduleRealInfo> refs = new ArrayList<>();
+                refs.add(sch);
+                refs.add(next);
+                sendUtils.refreshSch(refs);
+                return;
+            }
+        }
+
+        if (flag) {
+            sendUtils.refreshSch(sch);
+        }
+    }
+}
+package com.bsth.data.summary.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 烂班情况
+ * Created by panzhao on 2017/10/31.
+ */
+@Entity
+@Table(name = "z_calc_destroy_detail")
+public class DestroySituation {
+
+    @Id
+    private Long id;
+
+    private String rq;
+
+    private String gsBm;
+
+    private String fgsBm;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String nbbm;
+
+    private String jGh;
+
+    private String sGh;
+
+    private String reason;
+
+    private int size;
+
+    private Double mileage;
+
+    private Long t;
+
+    private String remark;
+
+    private String idsStr;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public Double getMileage() {
+        return mileage;
+    }
+
+    public void setMileage(Double mileage) {
+        this.mileage = mileage;
+    }
+
+    public Long getT() {
+        return t;
+    }
+
+    public void setT(Long t) {
+        this.t = t;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIdsStr() {
+        return idsStr;
+    }
+
+    public void setIdsStr(String idsStr) {
+        this.idsStr = idsStr;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+}
+package com.bsth.data.summary.repository;
+
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Repository
+public interface DestroySituationRepository extends BaseRepository<DestroySituation, Long> {
+}
+package com.bsth.data.summary.service;
+
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+public interface DestroySituationService extends BaseService<DestroySituation, Long> {
+}
+package com.bsth.data.summary.service.impl;
+
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.data.summary.service.DestroySituationService;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Service
+public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituation, Long> implements DestroySituationService {
+}
@@ -65,6 +65,8 @@ public class LineConfig {
 	/** 原线路回场 */
 	private boolean inParkForSource;
+	private boolean autoExec;
+
 	/**
 	 * 到离站偏移值
 	 */
@@ -294,4 +296,12 @@ public class LineConfig {
 	public void setLockFirstOutTime(boolean lockFirstOutTime) {
 		this.lockFirstOutTime = lockFirstOutTime;
 	}
+
+	public boolean isAutoExec() {
+		return autoExec;
+	}
+
+	public void setAutoExec(boolean autoExec) {
+		this.autoExec = autoExec;
+	}
 }
@@ -2,33 +2,6 @@ package com.bsth.service.oil.impl;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
@@ -36,24 +9,34 @@ import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.oil.Cdl;
-import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Jdl;
-import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
-import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.oil.CdlRepository;
-import com.bsth.repository.oil.CylRepository;
 import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.JdlRepository;
-import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.DlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.Arith;
 import com.bsth.util.BatchSaveUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
@@ -601,7 +584,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									 }else{
 										 t.setUpdatetime(date);
 									     updateList.add(t); 
-									     ins += t.getId().toString()+",";
 									  }
 								 }
 //								repository.save(t);
@@ -26,4 +26,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     Map<String,Object> parkAndStationSet(Map<String, String> map);
     Map<String,Object> findByIdx(String idx);
+
+    Map<String,Object> setAutoExec(Map<String, String> map);
 }
@@ -224,4 +224,25 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> setAutoExec(Map<String, String> map) {
+        String lineCode = map.get("lineCode").toString();
+        boolean autoExec = Boolean.parseBoolean(map.get("autoExec").toString());
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+            conf.setAutoExec(autoExec);
+
+            lineConfigData.set(conf);
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("conf", conf);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }
@@ -42,67 +42,35 @@
         }
         .ct_destroy_sch_table_width th:nth-of-type(1),.ct_destroy_sch_table_width td:nth-of-type(1){
-            width: 10%;
+            width: 9%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(2),.ct_destroy_sch_table_width td:nth-of-type(2){
-            width: 10%;
+            width: 9%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(3),.ct_destroy_sch_table_width td:nth-of-type(3){
-            width: 10%;
+            width: 9%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(4),.ct_destroy_sch_table_width td:nth-of-type(4){
-            width: 10%;
+            width: 9%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(5),.ct_destroy_sch_table_width td:nth-of-type(5){
-            width: 10%;
+            width: 9%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(6),.ct_destroy_sch_table_width td:nth-of-type(6){
-            width: 10%;
+            width: 9%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(7),.ct_destroy_sch_table_width td:nth-of-type(7){
-            width: 10%;
+            width: 8%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(8),.ct_destroy_sch_table_width td:nth-of-type(8){
-            width: 10%;
+            width: 8%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(9),.ct_destroy_sch_table_width td:nth-of-type(9){
-            width: 10%;
+            width: 8%;
         }
         .ct_destroy_sch_table_width th:nth-of-type(10),.ct_destroy_sch_table_width td:nth-of-type(10){
-            width: 10%;
         }
-/*        .ct_table_wrap.day th:nth-of-type(1),.ct_table_wrap.day td:nth-of-type(1){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(2),.ct_table_wrap.day td:nth-of-type(2){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(3),.ct_table_wrap.day td:nth-of-type(3){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(4),.ct_table_wrap.day td:nth-of-type(4){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(5),.ct_table_wrap.day td:nth-of-type(5){
-            width: 5%;
-        }
-        .ct_table_wrap.day th:nth-of-type(6),.ct_table_wrap.day td:nth-of-type(6){
-            width: 15%;
-        }
-        .ct_table_wrap.day th:nth-of-type(7),.ct_table_wrap.day td:nth-of-type(7){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(8),.ct_table_wrap.day td:nth-of-type(8){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(9),.ct_table_wrap.day td:nth-of-type(9){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(10),.ct_table_wrap.day td:nth-of-type(10){
-            width: 10%;
-        }*/
-
         .ct_search_form_wrap{
             border-bottom: 1px solid #e5e5e5;
             padding: 10px 0 25px 10px;
@@ -163,7 +131,6 @@
     <div class="ct_cont" >
         <div class="ct_search_form_wrap">
             <form>
-                <input type="hidden" name="status_eq" value="-1">
                 <div class="ct_field">
                     <label>公司：
                         <select class="uk-select" name="gsBm_eq">
@@ -178,7 +145,7 @@
                 </div>
                 <div class="ct_field">
                     <label>线路：
-                        <select class="uk-select" name="xlBm_eq">
+                        <select class="uk-select" name="lineCode_eq">
                         </select>
                     </label>
                 </div>
@@ -191,7 +158,7 @@
                     <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
                 </div>
                 <div class="ct_field ct_field_bottom">
-                    <span uk-icon="icon: question" title="暂时只支持单线路查询，目前实时汇总。导出功能先等等" uk-tooltip="pos: bottom"></span>
+                    <span uk-icon="icon: question" title="导出功能先等等" uk-tooltip="pos: bottom"></span>
                 </div>
             </form>
         </div>
@@ -225,16 +192,16 @@
 <script id="destroy_sch_list_temp" type="text/html">
     {{each list as obj i}}
         <tr>
-            <td>{{obj.scheduleDateStr}}</td>
-            <td>{{obj.xlName}}</td>
-            <td>{{obj.clZbh}}</td>
+            <td>{{obj.rq}}</td>
+            <td>{{obj.lineName}}</td>
+            <td>{{obj.nbbm}}</td>
             <td>{{obj.jGh}}</td>
             <td>{{obj.sGh}}</td>
-            <td>{{obj.adjustExps}}</td>
-            <td><a>{{obj.destroySize}}</a></td>
-            <td>{{obj.destroyMileageSum}}</td>
-            <td>{{obj.dfsj}}</td>
-            <td>{{obj.remarks}}</td>
+            <td>{{obj.reason}}</td>
+            <td><a>{{obj.size}}</a></td>
+            <td>{{obj.mileage}}</td>
+            <td>{{obj.timeStr}}</td>
+            <td>{{obj.remark}}</td>
         </tr>
     {{/each}}
 </script>
@@ -272,88 +239,28 @@
     function query() {
         $('button.search', f).attr('disabled', 'disabled');
         var data = f.serializeJSON();
-        //data.page = page;
-        //data.size = pageSize;
-
+        $('.ct_destroy_sch_table tbody').html('');
         //开始结束时间
-        data.scheduleDateStr_ge = data.rq.substr(0, 10);
-        data.scheduleDateStr_le = data.rq.substr(13);
-
+        data.rq_ge = data.rq.substr(0, 10);
+        data.rq_le = data.rq.substr(13);
+        data.order='t';
         delete data.rq;
-        $.get('/realSchedule/all', data, function (rs) {
-            console.log('rs', rs);
+        $.get('/summary/destroy_detail/all', data, function (rs) {
             $('button.search', f).removeAttr('disabled');
-
-            //按线路、车、人、烂班原因分组
-            var groupData = {}, key;
+            if(!rs || rs.length==0)
+                return UIkit.notification('没有搜索到相关数据！！', 'danger');
             $.each(rs, function () {
-                key=this.xlBm+'_'+this.clZbh+'_'+this.jGh+'_'+this.adjustExps;
-                if(!groupData[key])
-                    groupData[key] = [];
-
-                groupData[key].push(this);
+               this.timeStr=moment(this.t).format('HH:mm')
             });
-            var list = [], sch;
-            for(var k in groupData){
-                //排序
-                groupData[k].sort(sch_sort_fun);
-                sch=groupData[k][0];
-                sch.destroySize=groupData[k].length;
-                sch.destroyMileageSum=countMileage(groupData[k]);
-                list.push(sch);
-            }
-
-            var htmlStr = template('destroy_sch_list_temp', {list: list});
+            var htmlStr = template('destroy_sch_list_temp', {list: rs});
             $('.ct_destroy_sch_table tbody').html(htmlStr);
             $('.t_body_wrap').perfectScrollbar('update');
         });
     }
-    function sch_sort_fun(a, b) {
-        return a.dfsjT - b.dfsjT;
-    }
-
-    function countMileage(array) {
-        var sum=0;
-        $.each(array, function () {
-            sum = accAdd(sum, this.jhlcOrig);
-        });
-        return sum;
-    }
-
-    var accAdd = function (a, b) {
-        var c, d, e;
-        try {
-            c = a.toString().split(".")[1].length;
-        } catch (f) {
-            c = 0;
-        }
-        try {
-            d = b.toString().split(".")[1].length;
-        } catch (f) {
-            d = 0;
-        }
-        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
-    };
-
-    function mul(a, b) {
-        var c = 0,
-                d = a.toString(),
-                e = b.toString();
-        try {
-            c += d.split(".")[1].length;
-        } catch (f) {
-        }
-        try {
-            c += e.split(".")[1].length;
-        } catch (f) {
-        }
-        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
-    }
-
     //日期选择框
     var fs='YYYY-MM-DD'
             , ets=moment().subtract(1, 'days').format(fs)
@@ -408,13 +315,13 @@
     $('[name=fgsBm_eq]', f).on('change', function () {
         var k = $('[name=gsBm_eq]', f).val() + '_' + $(this).val();
         var array = lineMapps[k];
-        var opts = '';
+        var opts = '<option value="">全部</option>';
         if(array){
             $.each(array, function () {
                 opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
             });
         }
-        $('[name=xlBm_eq]', f).html(opts);
+        $('[name=lineCode_eq]', f).html(opts);
     });
     //
@@ -425,9 +332,6 @@
         return false;
     });
-    $('#add_hours_icon').on('click', function () {
-        UIkit.notification('暂不开放！', 'danger');
-    });
 </script>
 </body>
 </html>
 \ No newline at end of file
@@ -262,8 +262,8 @@
     }
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-10-23');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-23', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val(moment().subtract(2,'days').format('YYYY-MM-DD'));
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh"});
     var comps;
     //构建公司级联下拉框
@@ -20,6 +20,7 @@
         <div class="uk-accordion-content">
             <ul class="uk-list uk-list-line" id="smooth_scroll_list">
                 <li><a data-href="#schedule_reload_time_panel" >班次更新时间</a></li>
+                <li><a data-href="#schedule_auto_exec_panel" >班次自动执行</a></li>
                 <li><a data-href="#out_time_type_panel" >出场时间类型</a></li>
                 <li><a data-href="#in_park_source_panel" >原线路回场</a></li>
                 <li><a data-href="#buffer_inOut_diff_panel">到站缓冲区设置</a></li>
@@ -28,6 +28,34 @@
                 <button class="uk-button uk-button-mini" disabled>加载历史GPS恢复到离站</button>
             </div>
         </div>
+
+        <div id="schedule_auto_exec_panel">
+            <h2 class="btn_title_line">
+                <a class="uk-link-reset">班次自动执行</a>
+            </h2>
+            <div>
+                <div>
+                    <label>
+                        <input type="checkbox" id="enableAutoExec"> 启用自动班次执行
+                    </label>
+                </div>
+                <ul class="uk-list">
+                    <li>
+                        <small style="color: red;font-size: 14px;">1、 你必须只应该对【无固定走向且无人监管的线路】启用此项。</small>
+                    </li>
+                    <li>
+                        <small>2、启用该选项后，系统将不再依赖相关定位信号来执行班次。</small>
+                    </li>
+                    <li>
+                        <small>3、系统将在合适的时候自动填入实发实达时间，以完善报表。</small>
+                    </li>
+                    <li>
+                        <small>4、系统不会下发班次调度指令。</small>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
         <div id="out_time_type_panel">
             <h2 class="btn_title_line">
                 <a class="uk-link-reset">出场时间类型</a>
@@ -165,6 +193,7 @@
                 $('#clearRealScheduleBtn', wrap).on('click', clearRealSchedule);
                 //重新载入实际排班
                 $('#reLoadRealScheduleBtn', wrap).on('click', reLoadRealSchedule);
+                $('#enableAutoExec', wrap).on('click', autoExecFun);
             });
             function changeTwinsParkAndStation() {
@@ -256,6 +285,43 @@
                 $('select[name=twinsPark]', wrap).on('change', changeTwinsParkAndStation);
                 $('select[name=twinsStation]', wrap).on('change', changeTwinsParkAndStation);
             }
+
+            /**
+             * 自动执行
+             */
+            function autoExecFun(){
+                var that = this;
+                if(that.checked){
+                    that.checked = false;
+                    alt_confirm('<span style="color: red;font-size: 16px;">启用【' + conf.line.name + '】的自动执行功能？</span>', function () {
+                        var data = {
+                            lineCode: conf.line.lineCode,
+                            autoExec: true
+                        };
+                        gb_common.$post('/lineConfig/setAutoExec', data, function (rs) {
+                            notify_succ('启用成功！');
+                            conf = rs.conf;
+
+                            that.checked = true;
+                        });
+                    }, '我确定要将【' + conf.line.name + '】设置为自动执行', true);
+                }
+                else{
+                    that.checked = true;
+                    alt_confirm('<span style="color: red;font-size: 16px;">禁用【' + conf.line.name + '】的自动执行功能？</span>', function () {
+                        var data = {
+                            lineCode: conf.line.lineCode,
+                            autoExec: false
+                        };
+                        gb_common.$post('/lineConfig/setAutoExec', data, function (rs) {
+                            notify_succ('禁用成功！');
+                            conf = rs.conf;
+
+                            that.checked = false;
+                        });
+                    }, '我确定要禁用【' + conf.line.name + '】的自动执行', true);
+                }
+            }
         })();
     </script>
 </div>
 \ No newline at end of file