Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang # Conflicts: # src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang # Conflicts: # src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
廖磊
2 parents efa7a44e fd5ae600
Showing 57 changed files with 2502 additions and 651 deletions
pom.xml
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/data/safe_driv/SafeDriv.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/HistoryGps_DTO.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/resources/datatools/ktrs/guideboardDataInput.ktr
src/main/resources/static/pages/base/timesmodel/countadd.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
src/main/resources/static/pages/base/timesmodel/js/raty/lib/img/cancel-off.png
src/main/resources/static/pages/base/timesmodel/js/raty/lib/img/cancel-on.png
@@ -237,6 +237,27 @@
 			<version>1.13</version>
 		</dependency>
  
+        <dependency>
+            <groupId>org.dbunit</groupId>
+            <artifactId>dbunit</artifactId>
+            <version>2.4.9</version>
+            <scope>test</scope>
+
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.2.132</version>
+            <scope>test</scope>
+        </dependency>
+
 	</dependencies>
  
 	<dependencyManagement>
@@ -108,4 +108,22 @@ public class GpsController {
     public Map<String, Object> history_v2(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
         return gpsService.history_v2(nbbm, st, et);
     }
+
+    /**
+     * 安全驾驶数据 分页查询
+     * @param map
+     * @param page
+     * @param size
+     * @param order
+     * @param direction
+     * @return
+     */
+    @RequestMapping(value = "/safeDriv")
+    public Map<String, Object> safeDrivList(@RequestParam Map<String, Object> map,
+                                       @RequestParam(defaultValue = "0") int page,
+                                       @RequestParam(defaultValue = "15") int size,
+                                       @RequestParam(defaultValue = "timestamp") String order,
+                                       @RequestParam(defaultValue = "DESC") String direction){
+        return gpsService.safeDrivList(map , page, size, order, direction);
+    }
 }
@@ -27,6 +27,8 @@ public class SafeDriv {
      */
     private String xlmc;
  
+    private String xlbm;
+
     /**
      * 车辆自编号
      */
@@ -127,4 +129,12 @@ public class SafeDriv {
     public void setTs(Long ts) {
         this.ts = ts;
     }
+
+    public String getXlbm() {
+        return xlbm;
+    }
+
+    public void setXlbm(String xlbm) {
+        this.xlbm = xlbm;
+    }
 }
 package com.bsth.data.safe_driv;
  
-import com.bsth.Application;
 import com.bsth.websocket.handler.SendUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -15,7 +14,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
  
 /**
  * 安全驾驶
@@ -44,7 +42,6 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
     private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
     public static void put(SafeDriv sd){
         sd.setTs(fmt.parseMillis(sd.getStartime()));
-        data.add(sd);
  
         if(sd.getYczltype().indexOf("A") == -1)
             sd.setYczltype("A" + sd.getYczltype());
@@ -53,15 +50,24 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
         if(old == null || sd.getTs() > old.getTs()){
             //通知客户端
             sendUtils.sendSafeDriv(sd);
+            data.add(sd);
+            safeMap.put(sd.getClzbh(), sd);
         }
+    }
+
+    public static Set<SafeDriv> findAll(){
+        return data;
+    }
  
-        safeMap.put(sd.getClzbh(), sd);
+    public static void clear(){
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
     }
  
     @Override
     public void run(String... strings) throws Exception {
         //定时加载安全驾驶数据
-        Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 5, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 60, TimeUnit.SECONDS);
     }
  
     @Override
@@ -138,7 +138,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //dataRecovery();
  
         //翻班线程
-        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
@@ -384,9 +384,9 @@ public class DayOfSchedule implements CommandLineRunner {
                 }
  
                 sch.setJhlcOrig(sch.getJhlc());
-                //计划里程为0，设置NULL
-                //if (sch.getJhlc() != null && sch.getJhlc() == 0)
-                //    sch.setJhlc(null);
+                //保留备注
+                if(StringUtils.isNotEmpty(sch.getRemark()))
+                    sch.setRemarks(sch.getRemark());
             }
         } catch (Exception e) {
             logger.error("", e);
 package com.bsth.data.schedule.thread;
  
 import com.bsth.service.oil.DlbService;
+import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +28,9 @@ public class CalcOilThread extends Thread{
             ylbService.obtainDsq();
             dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
+
+            //清除安全驾驶数据 先临时蹭这个线程
+            SafeDrivCenter.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
@@ -223,7 +223,7 @@ public class ChildTaskPlan {
  
 	@Override
 	public int hashCode() {
-		return ("" + this.getId() + this.getSchedule().getId()).hashCode();
+		return ("cTask" + this.getId() + this.getSchedule().getId()).hashCode();
 	}
  
 	@Override
@@ -145,6 +145,9 @@ public class ScheduleRealInfo {
  
 	/** 备注*/
 	private String remarks;
+
+	/** 原计划排班备注 */
+	private String remark;
  
 	/**待发时间（格式 HH:mm） */
 	private String dfsj;
@@ -168,7 +171,7 @@ public class ScheduleRealInfo {
 	private String qdzArrDatesj;
  
 	/** 子任务 */
-	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
  
 	/** 关联的公司名称 */
@@ -875,4 +878,12 @@ public class ScheduleRealInfo {
 		else
 			this.setLate(false);
 	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 }
@@ -128,6 +128,9 @@ public class SchedulePlanInfo {
     /** 关联的时刻表名字 */
     private String ttInfoName;
  
+    /** 时刻表的明细备注 */
+    private String remark;
+
  
     /** 创建人 */
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
@@ -269,6 +272,9 @@ public class SchedulePlanInfo {
         // 使用的时刻表名字
         this.ttInfoName = ttInfoDetail.getTtinfo().getName();
  
+        // 备注信息
+        this.remark = ttInfoDetail.getRemark();
+
         // 使用车辆配置的停车场信息
         String pzType = carConfigInfo.getPzType(); // 配置类型
         if (pzType != null && !pzType.equals("BSY")) {
@@ -648,4 +654,12 @@ public class SchedulePlanInfo {
     public void setTtInfoName(String ttInfoName) {
         this.ttInfoName = ttInfoName;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
@@ -35,21 +35,22 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "info.cl_zbh as clZbh, " +
             "group_concat(info.fcsj order by info.fcno) ccsj, " +
             "group_concat(info.bc_type order by info.fcno) bctype, " +
-            "group_concat(distinct info.j) jsyId, " +
-            "group_concat(distinct info.j_gh) jsyGh, " +
-            "group_concat(distinct info.j_name) jsyName, " +
-            "group_concat(distinct info.s) spyId, " +
-            "group_concat(distinct info.s_gh) spyGh, " +
-            "group_concat(distinct info.s_name) spyName, " +
+            "group_concat(distinct info.j order by info.fcno) jsyId, " +
+            "group_concat(distinct info.j_gh order by info.fcno) jsyGh, " +
+            "group_concat(distinct info.j_name order by info.fcno) jsyName, " +
+            "group_concat(distinct info.s order by info.fcno) spyId, " +
+            "group_concat(distinct info.s_gh order by info.fcno) spyGh, " +
+            "group_concat(distinct info.s_name order by info.fcno) spyName, " +
             "group_concat(info.fcno order by info.fcno) fcno, " +
             "max(info.update_date) as updateDate, " +
             "max(user.user_name) as updateUserName, " +
             "max(info.tt_info_name) as ttInfoName " +
             "from bsth_c_s_sp_info info left join bsth_c_sys_user user on info.update_by = user.id " +
+            "left join bsth_c_s_gbi gbi on info.lp = gbi.id " +
             "where info.xl = ?1 and " +
             "info.schedule_date = ?2 " +
             "group by info.xl_name, info.schedule_date, info.lp, info.lp_name, info.cl, info.cl_zbh " +
-            "order by info.xl_name, info.schedule_date, info.lp ", nativeQuery = true)
+            "order by info.xl_name, info.schedule_date, gbi.lp_no ", nativeQuery = true)
     List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
  
     @Modifying
@@ -27,4 +27,6 @@ public interface GpsService {
 	List<GpsSpeed_DTO> speeds(String nbbm, long st, long et);
  
 	List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et);
+
+	Map<String, Object> safeDrivList(Map<String, Object> map, int page, int size, String order, String direction);
 }
@@ -6,12 +6,17 @@ import com.bsth.data.arrival.ArrivalEntity;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.data.safe_driv.SafeDriv;
+import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.gps.entity.*;
+import com.bsth.service.gps.entity.GpsOutbound_DTO;
+import com.bsth.service.gps.entity.GpsSpeed_DTO;
+import com.bsth.service.gps.entity.HistoryGps_DTO;
+import com.bsth.service.gps.entity.Road_DTO;
 import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
@@ -28,6 +33,7 @@ import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.text.DecimalFormat;
 import java.util.*;
  
 @Service
@@ -353,17 +359,12 @@ public class GpsServiceImpl implements GpsService {
             //过滤后的
             List<GpsEntity> rs = new ArrayList<>();
             Field[] fields = GpsEntity.class.getDeclaredFields();
-            //排序字段
-            Field orderField = null;
             //参与过滤的字段
             List<Field> fs = new ArrayList<>();
             for (Field f : fields) {
                 f.setAccessible(true);
                 if (map.containsKey(f.getName()))
                     fs.add(f);
-
-                if (f.getName().equals(order))
-                    orderField = f;
             }
             //过滤数据
             for (GpsEntity gps : list) {
@@ -371,9 +372,6 @@ public class GpsServiceImpl implements GpsService {
                     rs.add(gps);
             }
  
-            //排序
-/*            if (null != orderField)
-                sortGpsList(orderField, rs);*/
             //时间戳排序
             Collections.sort(rs, new Comparator<GpsEntity>() {
                 @Override
@@ -538,11 +536,25 @@ public class GpsServiceImpl implements GpsService {
             List<GpsSpeed_DTO> speedList = speeds(nbbm, st, et);
             //越界数据
             List<GpsOutbound_DTO> outboundList = outbounds(nbbm, st, et);
+            //计算里程
+            List<HistoryGps_DTO> effList = new ArrayList<>();
+            for(HistoryGps_DTO gps : list){
+                if(gps.getLat() != 0 && gps.getLon() != 0)
+                    effList.add(gps);
+            }
+            double sum = 0, dist;
+            for (int i = 0; i < effList.size() - 1; i++) {
+                dist = GeoUtils.getDistance(effList.get(i).getPoint(), effList.get(i + 1).getPoint());
+                //点位相同时，dist会NaN
+                if(String.valueOf(dist).matches("^[0.0-9.0]+$"))
+                    sum += dist;
+            }
  
             rs.put("status", ResponseCode.SUCCESS);
-            rs.put("list", removeDuplicate(list));
+            rs.put("list", removeDuplicate(effList));
             rs.put("speedList", speedList);
             rs.put("outboundList", outboundList);
+            rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -571,10 +583,56 @@ public class GpsServiceImpl implements GpsService {
         int weekYear = weekCal.get(Calendar.WEEK_OF_YEAR);
         //设备号
         String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-        String sql = "select vehicle,line,up_down,lon,lat,timestamp from bsth_c_outbound where weeks_year="+weekYear+" and vehicle=? and timestamp>? and timestamp<?";
+        String sql = "select vehicle,line,up_down,lon,lat,timestamp from bsth_c_outbound where weeks_year=" + weekYear + " and vehicle=? and timestamp>? and timestamp<?";
         return GpsOutbound_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st, et));
     }
  
+    @Override
+    public Map<String, Object> safeDrivList(Map<String, Object> map, int page, int size, String order, String direction) {
+        Map<String, Object> rsMap = new HashMap<>();
+        try {
+            //全量
+            List<SafeDriv> list = new ArrayList<>(SafeDrivCenter.findAll());
+            //过滤后的
+            List<SafeDriv> rs = new ArrayList<>();
+            Field[] fields = SafeDriv.class.getDeclaredFields();
+            //参与过滤的字段
+            List<Field> fs = new ArrayList<>();
+            for (Field f : fields) {
+                f.setAccessible(true);
+                if (map.containsKey(f.getName()))
+                    fs.add(f);
+            }
+            //过滤数据
+            for (SafeDriv sd : list) {
+                if (fieldEquals(fs, sd, map))
+                    rs.add(sd);
+            }
+
+            //时间戳排序
+            Collections.sort(rs, new Comparator<SafeDriv>() {
+                @Override
+                public int compare(SafeDriv o1, SafeDriv o2) {
+                    return o2.getTs().intValue() - o1.getTs().intValue();
+                }
+            });
+
+            //分页
+            int count = rs.size(), s = page * size, e = s + size;
+            if (e > count)
+                e = count;
+
+            rsMap.put("list", rs.subList(s, e));
+            rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
+            rsMap.put("page", page);
+            rsMap.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rsMap.put("status", ResponseCode.ERROR);
+        }
+        return rsMap;
+    }
+
     private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads) {
         double min = -1, distance;
         Road_DTO nearRoad = null;
@@ -29,8 +29,8 @@ public class HistoryGps_DTO {
         return list;
     }
  
-    private double gcj_lon;
-    private double gcj_lat;
+    //private double gcj_lon;
+    //private double gcj_lat;
  
     private double bd_lon;
     private double bd_lat;
@@ -82,7 +82,7 @@ public class HistoryGps_DTO {
         return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
     }
  
-    public double getGcj_lon() {
+/*    public double getGcj_lon() {
         return gcj_lon;
     }
  
@@ -96,7 +96,7 @@ public class HistoryGps_DTO {
  
     public void setGcj_lat(double gcj_lat) {
         this.gcj_lat = gcj_lat;
-    }
+    }*/
  
     public double getBd_lon() {
         return bd_lon;
 package com.bsth.service.realcontrol.impl;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
-import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -10,19 +10,19 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
  
 import javax.transaction.Transactional;
+import java.util.HashMap;
 import java.util.Map;
  
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService {
  
-	/*@Autowired
-    ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
-
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
  
@@ -33,34 +33,41 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
     DayOfSchedule dayOfSchedule;
  
     @Autowired
-    Arrival2Schedule arrival2Schedule;
-
-    @Autowired
     JdbcTemplate jdbcTemplate;
  
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @Transactional
     @Override
     public Map<String, Object> save(ChildTaskPlan t) {
-        ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
-        Map<String, Object> rs;
-        //保存起终点名称
-        String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
-
-        if(StringUtils.isEmpty(t.getStartStationName()))
-            t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
-
-        if(StringUtils.isEmpty(t.getEndStationName()))
-            t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
-        //先持久化子任务
-        rs = super.save(t);
-        //再关联主任务
-        sch.getcTasks().add(t);
-        dayOfSchedule.save(sch);
-
-        rs.put("t", sch);
  
-        if (sch.getZdsjActual() == null)
-            arrival2Schedule.removeExpect(sch.getClZbh());
+        Map<String, Object> rs = new HashMap();
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
+            //保存起终点名称
+            String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+            if(StringUtils.isEmpty(t.getStartStationName()))
+                t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
+
+            if(StringUtils.isEmpty(t.getEndStationName()))
+                t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+            //先持久化子任务
+            rs = super.save(t);
+            //关联主任务
+            System.out.println("schschsch: " + sch);
+            System.out.println("sch.getcTasks()sch.getcTasks(): " + sch.getcTasks());
+            sch.getcTasks().add(t);
+            dayOfSchedule.save(sch);
+            //直接持久化
+            //scheduleRealInfoRepository.save(sch);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("t", sch);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg",  e.getMessage());
+        }
         return rs;
     }
  
@@ -69,16 +76,13 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         Map<String, Object> rs;
  
         ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
-        //解除和主任务关联
-        ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
-        sch.getcTasks().remove(cPlan);
-        //删除关联表数据
-        jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real=" + sch.getId() + " and c_tasks=" + cPlan.getId());
  
         //删除子任务
         rs = super.delete(id);
-        dayOfSchedule.save(sch);
-
+        //dayOfSchedule.save(sch);
+        //解除和主任务关联
+        ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
+        sch.getcTasks().remove(cPlan);
         rs.put("t", sch);
         return rs;
     }
@@ -276,6 +276,155 @@
   <hop> <from>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_gbi</to><enabled>Y</enabled> </hop>
   </order>
   <step>
+    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
+    <type>ExcelInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <noempty>Y</noempty>
+    <stoponempty>N</stoponempty>
+    <filefield/>
+    <sheetfield/>
+    <sheetrownumfield/>
+    <rownumfield/>
+    <sheetfield/>
+    <filefield/>
+    <limit>0</limit>
+    <encoding/>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <accept_filenames>Y</accept_filenames>
+    <accept_field>filepath_</accept_field>
+    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>&#x7ebf;&#x8def;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x7f16;&#x53f7;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x540d;&#x79f0;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x7c7b;&#x578b;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+    </fields>
+    <sheets>
+      <sheet>
+        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
+        <startrow>0</startrow>
+        <startcol>0</startcol>
+        </sheet>
+    </sheets>
+    <strict_types>N</strict_types>
+    <error_ignored>N</error_ignored>
+    <error_line_skipped>N</error_line_skipped>
+    <bad_line_files_destination_directory/>
+    <bad_line_files_extension>warning</bad_line_files_extension>
+    <error_line_files_destination_directory/>
+    <error_line_files_extension>error</error_line_files_extension>
+    <line_number_files_destination_directory/>
+    <line_number_files_extension>line</line_number_files_extension>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <spreadsheet_type>JXL</spreadsheet_type>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>150</xloc>
+      <yloc>68</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
+    <type>Constant</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+      <field>
+        <name>isCancel</name>
+        <type>Integer</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>0</nullif>
+        <length>-1</length>
+        <precision>-1</precision>
+        <set_empty_string>N</set_empty_string>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>544</xloc>
+      <yloc>70</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x5b57;&#x6bb5;&#x6539;&#x540d;</name>
     <type>SelectValues</type>
     <description/>
@@ -393,27 +542,27 @@
       <value>
         <name>xl</name>
         <rename>xlid</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_no</name>
         <rename>lpno</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_name</name>
         <rename>lpname</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_type</name>
         <rename>lptype</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>is_cancel</name>
         <rename>isCancel</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
     </lookup>
      <cluster_schema/>
@@ -512,122 +661,6 @@
     </step>
  
   <step>
-    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
-    <type>ExcelInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <noempty>Y</noempty>
-    <stoponempty>N</stoponempty>
-    <filefield/>
-    <sheetfield/>
-    <sheetrownumfield/>
-    <rownumfield/>
-    <sheetfield/>
-    <filefield/>
-    <limit>0</limit>
-    <encoding/>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <accept_filenames>Y</accept_filenames>
-    <accept_field>filepath_</accept_field>
-    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
-    <file>
-      <name/>
-      <filemask/>
-      <exclude_filemask/>
-      <file_required>N</file_required>
-      <include_subfolders>N</include_subfolders>
-    </file>
-    <fields>
-      <field>
-        <name>&#x7ebf;&#x8def;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x7f16;&#x53f7;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format>&#x23;</format>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x540d;&#x79f0;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format>&#x23;</format>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x7c7b;&#x578b;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-    </fields>
-    <sheets>
-      <sheet>
-        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
-        <startrow>0</startrow>
-        <startcol>0</startcol>
-        </sheet>
-    </sheets>
-    <strict_types>N</strict_types>
-    <error_ignored>N</error_ignored>
-    <error_line_skipped>N</error_line_skipped>
-    <bad_line_files_destination_directory/>
-    <bad_line_files_extension>warning</bad_line_files_extension>
-    <error_line_files_destination_directory/>
-    <error_line_files_extension>error</error_line_files_extension>
-    <line_number_files_destination_directory/>
-    <line_number_files_extension>line</line_number_files_extension>
-    <shortFileFieldName/>
-    <pathFieldName/>
-    <hiddenFieldName/>
-    <lastModificationTimeFieldName/>
-    <uriNameFieldName/>
-    <rootUriNameFieldName/>
-    <extensionFieldName/>
-    <sizeFieldName/>
-    <spreadsheet_type>JXL</spreadsheet_type>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>150</xloc>
-      <yloc>68</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x9519;&#x8bef;&#x8f93;&#x51fa;</name>
     <type>ExcelOutput</type>
     <description/>
@@ -754,39 +787,6 @@
       </GUI>
     </step>
  
-  <step>
-    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
-    <type>Constant</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>
-      <field>
-        <name>isCancel</name>
-        <type>Integer</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>0</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-    </fields>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>544</xloc>
-      <yloc>70</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
   <step_error_handling>
       <error>
         <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_gbi</source_step>
+<!-- 统计数据 -->
+<div class="modal fade" id="countadd_mobal" tabindex="-1" role="basic" aria-hidden="true">
+	<div class="modal-dialog" style="margin-left: 400px;">
+		<div class="modal-content" style="width: 700px;">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">统计数据 </h4>
+			</div>
+			<div class="modal-body">
+				<div class="portlet-body">
+					<div class="table-container" style="margin-top: 10px">
+						<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_countadd">
+							<thead>
+								<tr role="row" class="heading">
+									<th width="1%">序号</th>
+									<th width="45%">统计项目</th>
+									<th width="15%">统计数值</th>
+								</tr>
+							</thead>
+							<tbody></tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">关闭</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="countAdd_temp">
+{{each list as obj i }}
+	<tr role="row" class="filter">
+		<td>{{i+1}}</td>
+		<td>
+			{{obj.name}}
+		</td>
+		<td style="vertical-align:middle; text-align:center;">
+			{{if obj.name == '综合评估'}}
+				<div id="star"></div>
+			{{else}}
+				{{obj.value}}
+			{{/if}}
+		</td>
+	</tr>
+{{/each}}
+{{if list.length == 0}}
+		<tr>
+			<td colspan=3><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+{{/if}}
+</script>
+<script type="text/javascript">
+$('#countadd_mobal').on('countAddMobal.show', function(e,countDate){
+	// 加载延迟200毫秒显示mobal
+	setTimeout(function(){$('#countadd_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
+	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+	$('#countadd_mobal').on('show.bs.modal', function () {
+		// 把数据填充到模版中
+		var tbodyHtml = template('countAdd_temp',{list:countDate});
+		// 把渲染好的模版html文本追加到表格中
+		$('#datatable_countadd tbody').html(tbodyHtml);
+		$('#star').raty({ readOnly: true,score: 4.5 });
+	});
+});
+</script>
 \ No newline at end of file
@@ -19,19 +19,15 @@
  
 <!-- row 组件START -->
 <div class="row">
-	
 	<!-- col-md-12 组件START -->
 	<div class="col-md-12">
-		
 		<!-- portlet 组件START -->
 		<div class="portlet light porttlet-fit bordered">
-			
 			<!-- portlet-title组件START -->
 			<div class="portlet-title">
-				
 				<!-- caption 组件START  -->
 				<div class="caption">
-					 <i class="fa fa-database font-dark"></i>
+					 <i class="fa fa-bar-chart font-dark"></i>
 					 <span class="caption-subject font-dark sbold uppercase">时刻表明细模型</span>
 				</div>
 				<!-- caption 组件END -->
@@ -40,6 +36,9 @@
 				</div>
 				<!-- actions 组件START -->
 				<div class="actions">
+					<div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
+						<a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 统计数据</a>
+					</div>
 					<div class="btn-group btn-group-devided checkbtn" data-toggle="buttons">
 						<a class="btn btn-circle blue checkAdd" href="javascript:;" data-pjax><i class="fa fa-check"></i> 保存数据</a>
 					</div>
@@ -107,6 +106,7 @@
 	<!-- col-md-12 组件END -->
 </div>
 <!-- row 组件END -->
+<script src="/pages/base/timesmodel/js/raty/lib/jquery.raty.js"></script>
 <script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
 <script src="/pages/base/timesmodel/js/d3.relationshipgraph.js"></script>
@@ -201,7 +201,7 @@ $(&#39;.reladplus&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /** 
- * @description : (TODO) 均匀发车事件.
+ * @description : (TODO) 监听均匀发车事件.
  * 
  * @stutas : OK.
  * 	
@@ -229,8 +229,9 @@ $(&#39;.updownread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /** 
- * 调整班次点击事件
- * 	
+ * @description : (TODO) 调整班次点击事件
+ * 
+ * @status OK.
  ************************************************************************************************************************************************/
 $('.aboutread').on('click',function() {
 	// 判断选择框是否存在.
@@ -255,7 +256,7 @@ $(&#39;.aboutread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /** 
- * @description : (TODO) 保存数据.
+ * @description : (TODO) 监听保存数据事件.
  * 
  * @status OK. 
  ************************************************************************************************************************************************/
@@ -282,6 +283,112 @@ $(&#39;.aboutread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /**
+ * @description : (TODO) 监听统计数据事件.
+ * 
+ * @status OK.
+ ************************************************************************************************************************************************/
+ $('.countAdd').on('click',function() {
+	var list = $_GlobalGraph.getDataArray();
+	var countBc = 0,// 总班次
+		serviceBc = 0,// 营运班次
+		jcbc = 0, // 进场总班次.
+		ccbc = 0, // 出场总班次.
+		cfbc = 0,// 吃饭总班次.
+		zwlbbc = 0,// 早晚例保总班次.
+		countGs = 0.0,// 总工时
+		servicesj = 0,// 营运班次总时间
+		jcsj = 0.0,// 进场总时间.
+		ccsj = 0.0 // 出场总时间.
+		cfsj = 0.0, // 吃饭总时间.
+		zwlbsj = 0.0, // 早晚例保总时间.
+		ksBc = 0,// 空驶班次
+		serviceLc = 0.0 ,// 营运里程
+		ksLc = 0.0 ,// 空驶里程
+		avgTzjx = 0.0,// 平均停站间隙
+		gfServiceBc = 0,// 高峰营运班次
+		dgServiceBc = 0,// 低谷营运班次
+		gfAvgTzjx = 0.0,// 高峰平均停站间隙
+		dgAvgTzjx = 0.0;// 低谷平均停站间隙
+	for(var i = 0;i<list.length;i++) {
+		if(list[i].bcsj>0) {
+			countBc = countBc + 1;
+			countGs = countGs + list[i].STOPTIME + list[i].bcsj;
+			var nowDate = BaseFun.getDateTime(list[i].fcsj);
+			if((BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.zgfsjd[0].st,$_GlobalGraph.configuration.dataMap.zgfsjd[0].ed,nowDate) ||
+					BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.wgfsjd[0].st,$_GlobalGraph.configuration.dataMap.wgfsjd[0].ed,nowDate)) &&
+					(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.normal ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.region ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.major)) {
+				gfServiceBc = gfServiceBc + 1;
+				gfAvgTzjx = gfAvgTzjx + list[i].STOPTIME;
+			} else if((!BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.zgfsjd[0].st,$_GlobalGraph.configuration.dataMap.zgfsjd[0].ed,nowDate) ||
+						!BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.wgfsjd[0].st,$_GlobalGraph.configuration.dataMap.wgfsjd[0].ed,nowDate)) &&
+					(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.normal ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.region ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.major)){
+				dgServiceBc = dgServiceBc + 1;
+				dgAvgTzjx = dgAvgTzjx + list[i].STOPTIME;
+			}
+			if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.normal ||
+					list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.region ||
+					list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.major) {
+				serviceBc = serviceBc + 1;
+				serviceLc = serviceLc + list[i].jhlc;
+				servicesj = servicesj + list[i].bcsj;
+				avgTzjx = avgTzjx + list[i].STOPTIME;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.venting) {
+				ksBc = ksBc +1;
+				ksLc = ksLc  + list[i].jhlc;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.in_) {
+				jcbc = jcbc +1;
+				jcsj = jcsj + list[i].bcsj;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.out) {
+				ccbc = ccbc +1;
+				ccsj = ccsj + list[i].bcsj;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.cf) {
+				cfbc = cfbc +1;
+				cfsj = cfsj + list[i].bcsj;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.bd ||
+					list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.lc ) {
+				zwlbbc = zwlbbc +1;
+				zwlbsj = zwlbsj + list[i].bcsj;
+			}
+		}
+	}
+	dgAvgTzjx = dgAvgTzjx/dgServiceBc;
+	gfAvgTzjx = gfAvgTzjx/gfServiceBc;
+	avgTzjx = avgTzjx/dgServiceBc;
+	 var countDate = [{'name':'总班次(包括进出场、吃饭时间、早晚例保、营运且班次时间大于零的班次)','value':countBc},
+	                  {'name':'进场总班次(包括进场且班次时间大于零的班次)','value':jcbc},
+	                  {'name':'出场总班次(包括进场且班次时间大于零的班次)','value':ccbc},
+	                  {'name':'吃饭总班次(包括吃饭且班次时间大于零的班次)','value':cfbc},
+	                  {'name':'早晚例保总班次(包括早晚例保且时间大于零的班次)','value':zwlbbc},
+	                  {'name':'营运总班次(包括正常、区间、放大站且班次时间大于零班次)','value':serviceBc},
+	                  {'name':'进场总时间(包括进场班次且班次时间大于零)','value':parseFloat((jcsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'出场总时间(包括进场班次且班次时间大于零)','value':parseFloat((ccsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'吃饭总时间(包括吃饭班次且班次时间大于零)','value':parseFloat((cfsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'早晚例保总时间(包括早晚例保班次且时间大于零的)','value':parseFloat((zwlbsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'营运班次总时间(包括正常、区间、放大站且班次时间大于零)','value':parseFloat((servicesj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'总工时(包括进出场、吃饭时间、早晚例保、营运班次时间)','value': parseFloat((countGs/60).toFixed(2)) + ' 小时'},
+	                  {'name':'空驶班次(包括直放班次)','value':ksBc},
+	                  {'name':'营运里程(包括正常、区间、放大站里程)','value':serviceLc + ' 公里'},
+	                  {'name':'空驶里程(包括直放里程)','value':ksLc + ' 公里'},
+	                  {'name':'平均停站时间(营运班次停站时间总和/营运总班次)','value':parseInt(avgTzjx) + ' 分钟' },
+	                  {'name':'高峰营运班次(包括早晚高峰时段的正常、区间、放大站班次)','value':gfServiceBc},
+	                  {'name':'低谷营运班次(包括低谷时段的正常、区间、放大站班次)','value':dgServiceBc},
+	                  {'name':'高峰平均停站间隙(高峰营运班次停站时间总和/高峰营运班次总和)','value':parseInt(gfAvgTzjx) + ' 分钟'},
+	                  {'name':'低谷平均停站间隙(低谷营运班次停站时间总和/低谷营运班次总和)','value':parseInt(dgAvgTzjx) + ' 分钟'},
+	                  {'name':'综合评估','value':3}];
+	// 弹出层mobal页面
+	$.get('/pages/base/timesmodel/countadd.html', function(m){
+		$(pjaxContainer).append(m);
+		// 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。
+		$('#countadd_mobal').trigger('countAddMobal.show',[countDate]);
+	});
+ });
+/************************************************************************************************************************************************/
+
+/**
  * @description : (TODO)获取路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间) 
  * 
  * @params : [a1--班次数组；a2--路牌数组]
+/*!
+ * jQuery Raty - A Star Rating Plugin
+ * ------------------------------------------------------------------
+ *
+ * jQuery Raty is a plugin that generates a customizable star rating.
+ *
+ * Licensed under The MIT License
+ *
+ * @version        2.5.2
+ * @since          2010.06.11
+ * @author         Washington Botelho
+ * @documentation  wbotelhos.com/raty
+ *
+ * ------------------------------------------------------------------
+ *
+ *  <div id="star"></div>
+ *
+ *  $('#star').raty();
+ *
+ */
+
+;(function($) {
+
+  var methods = {
+    init: function(settings) {
+      return this.each(function() {
+        methods.destroy.call(this);
+
+        this.opt = $.extend(true, {}, $.fn.raty.defaults, settings);
+
+        var that  = $(this),
+            inits = ['number', 'readOnly', 'score', 'scoreName'];
+
+        methods._callback.call(this, inits);
+
+        if (this.opt.precision) {
+          methods._adjustPrecision.call(this);
+        }
+
+        this.opt.number = methods._between(this.opt.number, 0, this.opt.numberMax)
+
+        this.opt.path = this.opt.path || '';
+
+        if (this.opt.path && this.opt.path.slice(this.opt.path.length - 1, this.opt.path.length) !== '/') {
+          this.opt.path += '/';
+        }
+
+        this.stars = methods._createStars.call(this);
+        this.score = methods._createScore.call(this);
+
+        methods._apply.call(this, this.opt.score);
+
+        var space  = this.opt.space ? 4 : 0,
+            width  = this.opt.width || (this.opt.number * this.opt.size + this.opt.number * space);
+
+        if (this.opt.cancel) {
+          this.cancel = methods._createCancel.call(this);
+
+          width += (this.opt.size + space);
+        }
+
+        if (this.opt.readOnly) {
+          methods._lock.call(this);
+        } else {
+          that.css('cursor', 'pointer');
+          methods._binds.call(this);
+        }
+
+        if (this.opt.width !== false) {
+          that.css('width', width);
+        }
+
+        methods._target.call(this, this.opt.score);
+
+        that.data({ 'settings': this.opt, 'raty': true });
+      });
+    }, _adjustPrecision: function() {
+      this.opt.targetType = 'score';
+      this.opt.half       = true;
+    }, _apply: function(score) {
+      if (score && score > 0) {
+        score = methods._between(score, 0, this.opt.number);
+        this.score.val(score);
+      }
+
+      methods._fill.call(this, score);
+
+      if (score) {
+        methods._roundStars.call(this, score);
+      }
+    }, _between: function(value, min, max) {
+      return Math.min(Math.max(parseFloat(value), min), max);
+    }, _binds: function() {
+      if (this.cancel) {
+        methods._bindCancel.call(this);
+      }
+
+      methods._bindClick.call(this);
+      methods._bindOut.call(this);
+      methods._bindOver.call(this);
+    }, _bindCancel: function() {
+      methods._bindClickCancel.call(this);
+      methods._bindOutCancel.call(this);
+      methods._bindOverCancel.call(this);
+    }, _bindClick: function() {
+      var self = this,
+          that = $(self);
+
+      self.stars.on('click.raty', function(evt) {
+        self.score.val((self.opt.half || self.opt.precision) ? that.data('score') : this.alt);
+
+        if (self.opt.click) {
+          self.opt.click.call(self, parseFloat(self.score.val()), evt);
+        }
+      });
+    }, _bindClickCancel: function() {
+      var self = this;
+
+      self.cancel.on('click.raty', function(evt) {
+        self.score.removeAttr('value');
+
+        if (self.opt.click) {
+          self.opt.click.call(self, null, evt);
+        }
+      });
+    }, _bindOut: function() {
+      var self = this;
+
+      $(this).on('mouseleave.raty', function(evt) {
+        var score = parseFloat(self.score.val()) || undefined;
+
+        methods._apply.call(self, score);
+        methods._target.call(self, score, evt);
+
+        if (self.opt.mouseout) {
+          self.opt.mouseout.call(self, score, evt);
+        }
+      });
+    }, _bindOutCancel: function() {
+      var self = this;
+
+      self.cancel.on('mouseleave.raty', function(evt) {
+        $(this).attr('src', self.opt.path + self.opt.cancelOff);
+
+        if (self.opt.mouseout) {
+          self.opt.mouseout.call(self, self.score.val() || null, evt);
+        }
+      });
+    }, _bindOverCancel: function() {
+      var self = this;
+
+      self.cancel.on('mouseover.raty', function(evt) {
+        $(this).attr('src', self.opt.path + self.opt.cancelOn);
+
+        self.stars.attr('src', self.opt.path + self.opt.starOff);
+
+        methods._target.call(self, null, evt);
+
+        if (self.opt.mouseover) {
+          self.opt.mouseover.call(self, null);
+        }
+      });
+    }, _bindOver: function() {
+      var self   = this,
+          that   = $(self),
+          action = self.opt.half ? 'mousemove.raty' : 'mouseover.raty';
+
+      self.stars.on(action, function(evt) {
+        var score = parseInt(this.alt, 10);
+
+        if (self.opt.half) {
+          var position = parseFloat((evt.pageX - $(this).offset().left) / self.opt.size),
+              plus     = (position > .5) ? 1 : .5;
+
+          score = score - 1 + plus;
+
+          methods._fill.call(self, score);
+
+          if (self.opt.precision) {
+            score = score - plus + position;
+          }
+
+          methods._roundStars.call(self, score);
+
+          that.data('score', score);
+        } else {
+          methods._fill.call(self, score);
+        }
+
+        methods._target.call(self, score, evt);
+
+        if (self.opt.mouseover) {
+          self.opt.mouseover.call(self, score, evt);
+        }
+      });
+    }, _callback: function(options) {
+      for (i in options) {
+        if (typeof this.opt[options[i]] === 'function') {
+          this.opt[options[i]] = this.opt[options[i]].call(this);
+        }
+      }
+    }, _createCancel: function() {
+      var that   = $(this),
+          icon   = this.opt.path + this.opt.cancelOff,
+          cancel = $('<img />', { src: icon, alt: 'x', title: this.opt.cancelHint, 'class': 'raty-cancel' });
+
+      if (this.opt.cancelPlace == 'left') {
+        that.prepend('&#160;').prepend(cancel);
+      } else {
+        that.append('&#160;').append(cancel);
+      }
+
+      return cancel;
+    }, _createScore: function() {
+      return $('<input />', { type: 'hidden', name: this.opt.scoreName }).appendTo(this);
+    }, _createStars: function() {
+      var that = $(this);
+
+      for (var i = 1; i <= this.opt.number; i++) {
+        var title = methods._getHint.call(this, i),
+            icon  = (this.opt.score && this.opt.score >= i) ? 'starOn' : 'starOff';
+
+        icon = this.opt.path + this.opt[icon];
+
+        $('<img />', { src : icon, alt: i, title: title }).appendTo(this);
+
+        if (this.opt.space) {
+          that.append((i < this.opt.number) ? '&#160;' : '');
+        }
+      }
+
+      return that.children('img');
+    }, _error: function(message) {
+      $(this).html(message);
+
+      $.error(message);
+    }, _fill: function(score) {
+      var self  = this,
+          hash  = 0;
+
+      for (var i = 1; i <= self.stars.length; i++) {
+        var star   = self.stars.eq(i - 1),
+            select = self.opt.single ? (i == score) : (i <= score);
+
+        if (self.opt.iconRange && self.opt.iconRange.length > hash) {
+          var irange = self.opt.iconRange[hash],
+              on     = irange.on  || self.opt.starOn,
+              off    = irange.off || self.opt.starOff,
+              icon   = select ? on : off;
+
+          if (i <= irange.range) {
+            star.attr('src', self.opt.path + icon);
+          }
+
+          if (i == irange.range) {
+            hash++;
+          }
+        } else {
+          var icon = select ? 'starOn' : 'starOff';
+
+          star.attr('src', this.opt.path + this.opt[icon]);
+        }
+      }
+    }, _getHint: function(score) {
+      var hint = this.opt.hints[score - 1];
+      return (hint === '') ? '' : (hint || score);
+    }, _lock: function() {
+      var score = parseInt(this.score.val(), 10), // TODO: 3.1 >> [['1'], ['2'], ['3', '.1', '.2']]
+          hint  = score ? methods._getHint.call(this, score) : this.opt.noRatedMsg;
+
+      $(this).data('readonly', true).css('cursor', '').attr('title', hint);
+
+      this.score.attr('readonly', 'readonly');
+      this.stars.attr('title', hint);
+
+      if (this.cancel) {
+        this.cancel.hide();
+      }
+    }, _roundStars: function(score) {
+      var rest = (score - Math.floor(score)).toFixed(2);
+
+      if (rest > this.opt.round.down) {
+        var icon = 'starOn';                                 // Up:   [x.76 .. x.99]
+
+        if (this.opt.halfShow && rest < this.opt.round.up) { // Half: [x.26 .. x.75]
+          icon = 'starHalf';
+        } else if (rest < this.opt.round.full) {             // Down: [x.00 .. x.5]
+          icon = 'starOff';
+        }
+
+        this.stars.eq(Math.ceil(score) - 1).attr('src', this.opt.path + this.opt[icon]);
+      }                              // Full down: [x.00 .. x.25]
+    }, _target: function(score, evt) {
+      if (this.opt.target) {
+        var target = $(this.opt.target);
+
+        if (target.length === 0) {
+          methods._error.call(this, 'Target selector invalid or missing!');
+        }
+
+        if (this.opt.targetFormat.indexOf('{score}') < 0) {
+          methods._error.call(this, 'Template "{score}" missing!');
+        }
+
+        var mouseover = evt && evt.type == 'mouseover';
+
+        if (score === undefined) {
+          score = this.opt.targetText;
+        } else if (score === null) {
+          score = mouseover ? this.opt.cancelHint : this.opt.targetText;
+        } else {
+          if (this.opt.targetType == 'hint') {
+            score = methods._getHint.call(this, Math.ceil(score));
+          } else if (this.opt.precision) {
+            score = parseFloat(score).toFixed(1);
+          }
+
+          if (!mouseover && !this.opt.targetKeep) {
+            score = this.opt.targetText;
+          }
+        }
+
+        if (score) {
+          score = this.opt.targetFormat.toString().replace('{score}', score);
+        }
+
+        if (target.is(':input')) {
+          target.val(score);
+        } else {
+          target.html(score);
+        }
+      }
+    }, _unlock: function() {
+      $(this).data('readonly', false).css('cursor', 'pointer').removeAttr('title');
+
+      this.score.removeAttr('readonly', 'readonly');
+
+      for (var i = 0; i < this.opt.number; i++) {
+        this.stars.eq(i).attr('title', methods._getHint.call(this, i + 1));
+      }
+
+      if (this.cancel) {
+        this.cancel.css('display', '');
+      }
+    }, cancel: function(click) {
+      return this.each(function() {
+        if ($(this).data('readonly') !== true) {
+          methods[click ? 'click' : 'score'].call(this, null);
+          this.score.removeAttr('value');
+        }
+      });
+    }, click: function(score) {
+      return $(this).each(function() {
+        if ($(this).data('readonly') !== true) {
+          methods._apply.call(this, score);
+
+          if (!this.opt.click) {
+            methods._error.call(this, 'You must add the "click: function(score, evt) { }" callback.');
+          }
+
+          this.opt.click.call(this, score, { type: 'click' });
+
+          methods._target.call(this, score);
+        }
+      });
+    }, destroy: function() {
+      return $(this).each(function() {
+        var that = $(this),
+            raw  = that.data('raw');
+
+        if (raw) {
+          that.off('.raty').empty().css({ cursor: raw.style.cursor, width: raw.style.width }).removeData('readonly');
+        } else {
+          that.data('raw', that.clone()[0]);
+        }
+      });
+    }, getScore: function() {
+      var score = [],
+          value ;
+
+      $(this).each(function() {
+        value = this.score.val();
+
+        score.push(value ? parseFloat(value) : undefined);
+      });
+
+      return (score.length > 1) ? score : score[0];
+    }, readOnly: function(readonly) {
+      return this.each(function() {
+        var that = $(this);
+
+        if (that.data('readonly') !== readonly) {
+          if (readonly) {
+            that.off('.raty').children('img').off('.raty');
+
+            methods._lock.call(this);
+          } else {
+            methods._binds.call(this);
+            methods._unlock.call(this);
+          }
+
+          that.data('readonly', readonly);
+        }
+      });
+    }, reload: function() {
+      return methods.set.call(this, {});
+    }, score: function() {
+      return arguments.length ? methods.setScore.apply(this, arguments) : methods.getScore.call(this);
+    }, set: function(settings) {
+      return this.each(function() {
+        var that   = $(this),
+            actual = that.data('settings'),
+            news   = $.extend({}, actual, settings);
+
+        that.raty(news);
+      });
+    }, setScore: function(score) {
+      return $(this).each(function() {
+        if ($(this).data('readonly') !== true) {
+          methods._apply.call(this, score);
+          methods._target.call(this, score);
+        }
+      });
+    }
+  };
+
+  $.fn.raty = function(method) {
+    if (methods[method]) {
+      return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+    } else if (typeof method === 'object' || !method) {
+      return methods.init.apply(this, arguments);
+    } else {
+      $.error('Method ' + method + ' does not exist!');
+    }
+  };
+
+  $.fn.raty.defaults = {
+    cancel        : false,
+    cancelHint    : 'Cancel this rating!',
+    cancelOff     : 'cancel-off.png',
+    cancelOn      : 'cancel-on.png',
+    cancelPlace   : 'left',
+    click         : undefined,
+    half          : false,
+    halfShow      : true,
+    hints         : ['bad', 'poor', 'regular', 'good', 'gorgeous'],
+    iconRange     : undefined,
+    mouseout      : undefined,
+    mouseover     : undefined,
+    noRatedMsg    : 'Not rated yet!',
+    number        : 5,
+    numberMax     : 20,
+    path          : 'js/raty/lib/img/',
+    precision     : false,
+    readOnly      : false,
+    round         : { down: .25, full: .6, up: .76 },
+    score         : undefined,
+    scoreName     : 'score',
+    single        : false,
+    size          : 16,
+    space         : true,
+    starHalf      : 'star-half.png',
+    starOff       : 'star-off.png',
+    starOn        : 'star-on.png',
+    target        : undefined,
+    targetFormat  : '{score}',
+    targetKeep    : false,
+    targetText    : '',
+    targetType    : 'hint',
+    width         : undefined
+  };
+
+})(jQuery);
+/*!
+ * jQuery Raty - A Star Rating Plugin
+ *
+ * Licensed under The MIT License
+ *
+ * @version        2.5.2
+ * @author         Washington Botelho
+ * @documentation  wbotelhos.com/raty
+ *
+ */
+
+;(function(b){var a={init:function(c){return this.each(function(){a.destroy.call(this);this.opt=b.extend(true,{},b.fn.raty.defaults,c);var e=b(this),g=["number","readOnly","score","scoreName"];a._callback.call(this,g);if(this.opt.precision){a._adjustPrecision.call(this);}this.opt.number=a._between(this.opt.number,0,this.opt.numberMax);this.opt.path=this.opt.path||"";if(this.opt.path&&this.opt.path.slice(this.opt.path.length-1,this.opt.path.length)!=="/"){this.opt.path+="/";}this.stars=a._createStars.call(this);this.score=a._createScore.call(this);a._apply.call(this,this.opt.score);var f=this.opt.space?4:0,d=this.opt.width||(this.opt.number*this.opt.size+this.opt.number*f);if(this.opt.cancel){this.cancel=a._createCancel.call(this);d+=(this.opt.size+f);}if(this.opt.readOnly){a._lock.call(this);}else{e.css("cursor","pointer");a._binds.call(this);}if(this.opt.width!==false){e.css("width",d);}a._target.call(this,this.opt.score);e.data({settings:this.opt,raty:true});});},_adjustPrecision:function(){this.opt.targetType="score";this.opt.half=true;},_apply:function(c){if(c&&c>0){c=a._between(c,0,this.opt.number);this.score.val(c);}a._fill.call(this,c);if(c){a._roundStars.call(this,c);}},_between:function(e,d,c){return Math.min(Math.max(parseFloat(e),d),c);},_binds:function(){if(this.cancel){a._bindCancel.call(this);}a._bindClick.call(this);a._bindOut.call(this);a._bindOver.call(this);},_bindCancel:function(){a._bindClickCancel.call(this);a._bindOutCancel.call(this);a._bindOverCancel.call(this);},_bindClick:function(){var c=this,d=b(c);c.stars.on("click.raty",function(e){c.score.val((c.opt.half||c.opt.precision)?d.data("score"):this.alt);if(c.opt.click){c.opt.click.call(c,parseFloat(c.score.val()),e);}});},_bindClickCancel:function(){var c=this;c.cancel.on("click.raty",function(d){c.score.removeAttr("value");if(c.opt.click){c.opt.click.call(c,null,d);}});},_bindOut:function(){var c=this;b(this).on("mouseleave.raty",function(d){var e=parseFloat(c.score.val())||undefined;a._apply.call(c,e);a._target.call(c,e,d);if(c.opt.mouseout){c.opt.mouseout.call(c,e,d);}});},_bindOutCancel:function(){var c=this;c.cancel.on("mouseleave.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOff);if(c.opt.mouseout){c.opt.mouseout.call(c,c.score.val()||null,d);}});},_bindOverCancel:function(){var c=this;c.cancel.on("mouseover.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOn);c.stars.attr("src",c.opt.path+c.opt.starOff);a._target.call(c,null,d);if(c.opt.mouseover){c.opt.mouseover.call(c,null);}});},_bindOver:function(){var c=this,d=b(c),e=c.opt.half?"mousemove.raty":"mouseover.raty";c.stars.on(e,function(g){var h=parseInt(this.alt,10);if(c.opt.half){var f=parseFloat((g.pageX-b(this).offset().left)/c.opt.size),j=(f>0.5)?1:0.5;h=h-1+j;a._fill.call(c,h);if(c.opt.precision){h=h-j+f;}a._roundStars.call(c,h);d.data("score",h);}else{a._fill.call(c,h);}a._target.call(c,h,g);if(c.opt.mouseover){c.opt.mouseover.call(c,h,g);}});},_callback:function(c){for(i in c){if(typeof this.opt[c[i]]==="function"){this.opt[c[i]]=this.opt[c[i]].call(this);}}},_createCancel:function(){var e=b(this),c=this.opt.path+this.opt.cancelOff,d=b("<img />",{src:c,alt:"x",title:this.opt.cancelHint,"class":"raty-cancel"});if(this.opt.cancelPlace=="left"){e.prepend("&#160;").prepend(d);}else{e.append("&#160;").append(d);}return d;},_createScore:function(){return b("<input />",{type:"hidden",name:this.opt.scoreName}).appendTo(this);},_createStars:function(){var e=b(this);for(var c=1;c<=this.opt.number;c++){var f=a._getHint.call(this,c),d=(this.opt.score&&this.opt.score>=c)?"starOn":"starOff";d=this.opt.path+this.opt[d];b("<img />",{src:d,alt:c,title:f}).appendTo(this);if(this.opt.space){e.append((c<this.opt.number)?"&#160;":"");}}return e.children("img");},_error:function(c){b(this).html(c);b.error(c);},_fill:function(d){var m=this,e=0;for(var f=1;f<=m.stars.length;f++){var g=m.stars.eq(f-1),l=m.opt.single?(f==d):(f<=d);if(m.opt.iconRange&&m.opt.iconRange.length>e){var j=m.opt.iconRange[e],h=j.on||m.opt.starOn,c=j.off||m.opt.starOff,k=l?h:c;if(f<=j.range){g.attr("src",m.opt.path+k);}if(f==j.range){e++;}}else{var k=l?"starOn":"starOff";g.attr("src",this.opt.path+this.opt[k]);}}},_getHint:function(d){var c=this.opt.hints[d-1];return(c==="")?"":(c||d);},_lock:function(){var d=parseInt(this.score.val(),10),c=d?a._getHint.call(this,d):this.opt.noRatedMsg;b(this).data("readonly",true).css("cursor","").attr("title",c);this.score.attr("readonly","readonly");this.stars.attr("title",c);if(this.cancel){this.cancel.hide();}},_roundStars:function(e){var d=(e-Math.floor(e)).toFixed(2);if(d>this.opt.round.down){var c="starOn";if(this.opt.halfShow&&d<this.opt.round.up){c="starHalf";}else{if(d<this.opt.round.full){c="starOff";}}this.stars.eq(Math.ceil(e)-1).attr("src",this.opt.path+this.opt[c]);}},_target:function(f,d){if(this.opt.target){var e=b(this.opt.target);if(e.length===0){a._error.call(this,"Target selector invalid or missing!");}if(this.opt.targetFormat.indexOf("{score}")<0){a._error.call(this,'Template "{score}" missing!');}var c=d&&d.type=="mouseover";if(f===undefined){f=this.opt.targetText;}else{if(f===null){f=c?this.opt.cancelHint:this.opt.targetText;}else{if(this.opt.targetType=="hint"){f=a._getHint.call(this,Math.ceil(f));}else{if(this.opt.precision){f=parseFloat(f).toFixed(1);}}if(!c&&!this.opt.targetKeep){f=this.opt.targetText;}}}if(f){f=this.opt.targetFormat.toString().replace("{score}",f);}if(e.is(":input")){e.val(f);}else{e.html(f);}}},_unlock:function(){b(this).data("readonly",false).css("cursor","pointer").removeAttr("title");this.score.removeAttr("readonly","readonly");for(var c=0;c<this.opt.number;c++){this.stars.eq(c).attr("title",a._getHint.call(this,c+1));}if(this.cancel){this.cancel.css("display","");}},cancel:function(c){return this.each(function(){if(b(this).data("readonly")!==true){a[c?"click":"score"].call(this,null);this.score.removeAttr("value");}});},click:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);if(!this.opt.click){a._error.call(this,'You must add the "click: function(score, evt) { }" callback.');}this.opt.click.call(this,c,{type:"click"});a._target.call(this,c);}});},destroy:function(){return b(this).each(function(){var d=b(this),c=d.data("raw");if(c){d.off(".raty").empty().css({cursor:c.style.cursor,width:c.style.width}).removeData("readonly");}else{d.data("raw",d.clone()[0]);}});},getScore:function(){var d=[],c;b(this).each(function(){c=this.score.val();d.push(c?parseFloat(c):undefined);});return(d.length>1)?d:d[0];},readOnly:function(c){return this.each(function(){var d=b(this);if(d.data("readonly")!==c){if(c){d.off(".raty").children("img").off(".raty");a._lock.call(this);}else{a._binds.call(this);a._unlock.call(this);}d.data("readonly",c);}});},reload:function(){return a.set.call(this,{});},score:function(){return arguments.length?a.setScore.apply(this,arguments):a.getScore.call(this);},set:function(c){return this.each(function(){var e=b(this),f=e.data("settings"),d=b.extend({},f,c);e.raty(d);});},setScore:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);a._target.call(this,c);}});}};b.fn.raty=function(c){if(a[c]){return a[c].apply(this,Array.prototype.slice.call(arguments,1));}else{if(typeof c==="object"||!c){return a.init.apply(this,arguments);}else{b.error("Method "+c+" does not exist!");}}};b.fn.raty.defaults={cancel:false,cancelHint:"Cancel this rating!",cancelOff:"cancel-off.png",cancelOn:"cancel-on.png",cancelPlace:"left",click:undefined,half:false,halfShow:true,hints:["bad","poor","regular","good","gorgeous"],iconRange:undefined,mouseout:undefined,mouseover:undefined,noRatedMsg:"Not rated yet!",number:5,numberMax:20,path:"",precision:false,readOnly:false,round:{down:0.25,full:0.6,up:0.76},score:undefined,scoreName:"score",single:false,size:16,space:true,starHalf:"star-half.png",starOff:"star-off.png",starOn:"star-on.png",target:undefined,targetFormat:"{score}",targetKeep:false,targetText:"",targetType:"hint",width:undefined};})(jQuery);
@@ -97,8 +97,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 } else {
-                    this.isValidInfo = true;
-                    return true;
+                    this.isValidInfo = false;
+                    return false;
                 }
             };
  
@@ -324,7 +324,7 @@
                                                 ng-dblclick="$saTimeTableCtrl.$$cell_dbclick(rowIndex, colIndex, cell)"
                                                 ng-class="{
                                                     lpName: !cell.ttdid,
-                                                    error: cell.invalidFlag,
+                                                    error: cell.isValidInfo,
                                                     active: cell.sel,
                                                     region: cell.bc_type == 'region',
                                                     isfb: cell.isfb
@@ -3795,8 +3795,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 } else {
-                    this.isValidInfo = true;
-                    return true;
+                    this.isValidInfo = false;
+                    return false;
                 }
             };
  
@@ -14,8 +14,9 @@
                 <th style="width: 80px;">班次类型</th>
                 <th style="width: 80px;">上下行</th>
                 <th style="width: 80px;">发车时间</th>
-                <th style="width: 100px;">起点站</th>
-                <th style="width: 100px;">终点站</th>
+                <th style="width: 80px;">起点站</th>
+                <th style="width: 80px;">终点站</th>
+                <th style="width: 60px">备注</th>
                 <th style="width: 100%">时刻表</th>
                 <th style="width: 90px;">修改人</th>
                 <th style="width: 90px;">修改时间</th>
@@ -110,6 +111,15 @@
                     <a href="#"
                        tooltip-animation="false"
                        tooltip-placement="top"
+                       uib-tooltip="{{info.remark}}"
+                       tooltip-class="headClass">
+                        {{info.remark}}
+                    </a>
+                </td>
+                <td>
+                    <a href="#"
+                       tooltip-animation="false"
+                       tooltip-placement="top"
                        uib-tooltip="{{info.ttInfoName}}"
                        tooltip-class="headClass">
                         {{info.ttInfoName}}
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+!function(i){var t;window.UIkit&&(t=i(UIkit)),"function"==typeof define&&define.amd&&define("uikit-lightbox",["uikit"],function(){return t||i(UIkit)})}(function(i){"use strict";function t(t){if(e)return e.lightbox=t,e;e=i.$(['<div class="uk-modal">','<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2-200)+'px;">','<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>','<div class="uk-lightbox-content"></div>','<div class="uk-modal-spinner uk-hidden"></div>',"</div>","</div>"].join("")).appendTo("body"),e.dialog=e.find(".uk-modal-dialog:first"),e.content=e.find(".uk-lightbox-content:first"),e.loader=e.find(".uk-modal-spinner:first"),e.closer=e.find(".uk-close.uk-close-alt"),e.modal=i.modal(e,{modal:!1}),e.on("swipeRight swipeLeft",function(i){e.lightbox["swipeLeft"==i.type?"next":"previous"]()}).on("click","[data-lightbox-previous], [data-lightbox-next]",function(t){t.preventDefault(),e.lightbox[i.$(this).is("[data-lightbox-next]")?"next":"previous"]()}),e.on("hide.uk.modal",function(){e.content.html("")});var o={w:window.innerWidth,h:window.innerHeight};return i.$win.on("load resize orientationchange",i.Utils.debounce(function(){o.w!==window.innerWidth&&e.is(":visible")&&!i.Utils.isFullscreen()&&e.lightbox.fitSize(),o={w:window.innerWidth,h:window.innerHeight}},100)),e.lightbox=t,e}var e,o={};return i.component("lightbox",{defaults:{allowfullscreen:!0,duration:400,group:!1,keyboard:!0},index:0,items:!1,boot:function(){i.$html.on("click","[data-uk-lightbox]",function(t){t.preventDefault();var e=i.$(this);e.data("lightbox")||i.lightbox(e,i.Utils.options(e.attr("data-uk-lightbox"))),e.data("lightbox").show(e)}),i.$doc.on("keyup",function(i){if(e&&e.is(":visible")&&e.lightbox.options.keyboard)switch(i.preventDefault(),i.keyCode){case 37:e.lightbox.previous();break;case 39:e.lightbox.next()}})},init:function(){var t=[];if(this.index=0,this.siblings=[],this.element&&this.element.length){var e=this.options.group?i.$(['[data-uk-lightbox*="'+this.options.group+'"]',"[data-uk-lightbox*='"+this.options.group+"']"].join(",")):this.element;e.each(function(){var e=i.$(this);t.push({source:e.attr("href"),title:e.attr("data-title")||e.attr("title"),type:e.attr("data-lightbox-type")||"auto",link:e})}),this.index=e.index(this.element),this.siblings=t}else this.options.group&&this.options.group.length&&(this.siblings=this.options.group);this.trigger("lightbox-init",[this])},show:function(e){this.modal=t(this),this.modal.dialog.stop(),this.modal.content.stop();var o,n,s=this,h=i.$.Deferred();e=e||0,"object"==typeof e&&this.siblings.forEach(function(i,t){e[0]===i.link[0]&&(e=t)}),0>e?e=this.siblings.length-e:this.siblings[e]||(e=0),n=this.siblings[e],o={lightbox:s,source:n.source,type:n.type,index:e,promise:h,title:n.title,item:n,meta:{content:"",width:null,height:null}},this.index=e,this.modal.content.empty(),this.modal.is(":visible")||(this.modal.content.css({width:"",height:""}).empty(),this.modal.modal.show()),this.modal.loader.removeClass("uk-hidden"),h.promise().done(function(){s.data=o,s.fitSize(o)}).fail(function(){o.meta.content='<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>',o.meta.width=400,o.meta.height=300,s.data=o,s.fitSize(o)}),s.trigger("showitem.uk.lightbox",[o])},fitSize:function(){var t=this,e=this.data,o=this.modal.dialog.outerWidth()-this.modal.dialog.width(),n=parseInt(this.modal.dialog.css("margin-top"),10),s=parseInt(this.modal.dialog.css("margin-bottom"),10),h=n+s,a=e.meta.content,l=t.options.duration;this.siblings.length>1&&(a=[a,'<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>','<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'].join(""));var d,r,u=i.$("<div>&nbsp;</div>").css({opacity:0,position:"absolute",top:0,left:0,width:"100%","max-width":t.modal.dialog.css("max-width"),padding:t.modal.dialog.css("padding"),margin:t.modal.dialog.css("margin")}),c=e.meta.width,g=e.meta.height;u.appendTo("body").width(),d=u.width(),r=window.innerHeight-h,u.remove(),this.modal.dialog.find(".uk-modal-caption").remove(),e.title&&(this.modal.dialog.append('<div class="uk-modal-caption">'+e.title+"</div>"),r-=this.modal.dialog.find(".uk-modal-caption").outerHeight()),d<e.meta.width&&(g=Math.floor(g*(d/c)),c=d),g>r&&(g=Math.floor(r),c=Math.ceil(e.meta.width*(r/e.meta.height))),this.modal.content.css("opacity",0).width(c).html(a),"iframe"==e.type&&this.modal.content.find("iframe:first").height(g);var m=g+o,p=Math.floor(window.innerHeight/2-m/2)-h;0>p&&(p=0),this.modal.closer.addClass("uk-hidden"),t.modal.data("mwidth")==c&&t.modal.data("mheight")==g&&(l=0),this.modal.dialog.animate({width:c+o,height:g+o,top:p},l,"swing",function(){t.modal.loader.addClass("uk-hidden"),t.modal.content.css({width:""}).animate({opacity:1},function(){t.modal.closer.removeClass("uk-hidden")}),t.modal.data({mwidth:c,mheight:g})})},next:function(){this.show(this.siblings[this.index+1]?this.index+1:0)},previous:function(){this.show(this.siblings[this.index-1]?this.index-1:this.siblings.length-1)}}),i.plugin("lightbox","image",{init:function(i){i.on("showitem.uk.lightbox",function(i,t){if("image"==t.type||t.source&&t.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)){var e=function(i,e,o){t.meta={content:'<img class="uk-responsive-width" width="'+e+'" height="'+o+'" src ="'+i+'">',width:e,height:o},t.type="image",t.promise.resolve()};if(o[t.source])e(t.source,o[t.source].width,o[t.source].height);else{var n=new Image;n.onerror=function(){t.promise.reject("Loading image failed")},n.onload=function(){o[t.source]={width:n.width,height:n.height},e(t.source,o[t.source].width,o[t.source].height)},n.src=t.source}}})}}),i.plugin("lightbox","youtube",{init:function(i){var t=/(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,n=/youtu\.be\/(.*)/;i.on("showitem.uk.lightbox",function(i,s){var h,a,l=function(i,t,o){s.meta={content:'<iframe src="//www.youtube.com/embed/'+i+'" width="'+t+'" height="'+o+'" style="max-width:100%;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},s.type="iframe",s.promise.resolve()};if((a=s.source.match(t))&&(h=a[2]),(a=s.source.match(n))&&(h=a[1]),h){if(o[h])l(h,o[h].width,o[h].height);else{var d=new Image,r=!1;d.onerror=function(){o[h]={width:640,height:320},l(h,o[h].width,o[h].height)},d.onload=function(){120==d.width&&90==d.height?r?(o[h]={width:640,height:320},l(h,o[h].width,o[h].height)):(r=!0,d.src="//img.youtube.com/vi/"+h+"/0.jpg"):(o[h]={width:d.width,height:d.height},l(h,d.width,d.height))},d.src="//img.youtube.com/vi/"+h+"/maxresdefault.jpg"}i.stopImmediatePropagation()}})}}),i.plugin("lightbox","vimeo",{init:function(t){var n,s=/(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/;t.on("showitem.uk.lightbox",function(t,h){var a,l=function(i,t,o){h.meta={content:'<iframe src="//player.vimeo.com/video/'+i+'" width="'+t+'" height="'+o+'" style="width:100%;box-sizing:border-box;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},h.type="iframe",h.promise.resolve()};(n=h.source.match(s))&&(a=n[2],o[a]?l(a,o[a].width,o[a].height):i.$.ajax({type:"GET",url:"//vimeo.com/api/oembed.json?url="+encodeURI(h.source),jsonp:"callback",dataType:"jsonp",success:function(i){o[a]={width:i.width,height:i.height},l(a,o[a].width,o[a].height)}}),t.stopImmediatePropagation())})}}),i.plugin("lightbox","video",{init:function(t){t.on("showitem.uk.lightbox",function(t,e){var n=function(i,t,o){e.meta={content:'<video class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+o+'" controls></video>',width:t,height:o},e.type="video",e.promise.resolve()};if("video"==e.type||e.source.match(/\.(mp4|webm|ogv)$/i))if(o[e.source])n(e.source,o[e.source].width,o[e.source].height);else var s=i.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr("src",e.source).appendTo("body"),h=setInterval(function(){s[0].videoWidth&&(clearInterval(h),o[e.source]={width:s[0].videoWidth,height:s[0].videoHeight},n(e.source,o[e.source].width,o[e.source].height),s.remove())},20)})}}),UIkit.plugin("lightbox","iframe",{init:function(i){i.on("showitem.uk.lightbox",function(t,o){var n=function(i,t,n){o.meta={content:'<iframe class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+n+'"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:n},o.type="iframe",o.promise.resolve()};("iframe"===o.type||o.source.match(/\.(html|php)$/))&&n(o.source,i.options.width||800,i.options.height||600)})}}),i.lightbox.create=function(t,e){if(t){var o,n=[];return t.forEach(function(t){n.push(i.$.extend({source:"",title:"",type:"auto",link:!1},"string"==typeof t?{source:t}:t))}),o=i.lightbox(i.$.extend({},e,{group:n}))}},i.lightbox});
 \ No newline at end of file
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+.uk-slidenav{display:inline-block;box-sizing:border-box;width:60px;height:60px;line-height:60px;color:rgba(50,50,50,.4);font-size:60px;text-align:center}.uk-slidenav:focus,.uk-slidenav:hover{outline:0;text-decoration:none;color:rgba(50,50,50,.7);cursor:pointer}.uk-slidenav:active{color:rgba(50,50,50,.9)}.uk-slidenav-previous:before{content:"\f104";font-family:FontAwesome}.uk-slidenav-next:before{content:"\f105";font-family:FontAwesome}.uk-slidenav-position{position:relative}.uk-slidenav-position .uk-slidenav{display:none;position:absolute;top:50%;z-index:1;margin-top:-30px}.uk-slidenav-position:hover .uk-slidenav{display:block}.uk-slidenav-position .uk-slidenav-previous{left:20px}.uk-slidenav-position .uk-slidenav-next{right:20px}.uk-slidenav-contrast{color:rgba(255,255,255,.5)}.uk-slidenav-contrast:focus,.uk-slidenav-contrast:hover{color:rgba(255,255,255,.7)}.uk-slidenav-contrast:active{color:rgba(255,255,255,.9)}
 \ No newline at end of file
@@ -930,18 +930,19 @@ option.oil_station_opt{
     position: absolute;
     right: 12px;
     bottom: 12px;
+    z-index: 99;
 }
  
 .safe_driv_pop{
-    height: 45px;
     background: #d44b4b;
-    color: #f2f2f2;
     font-size: 15px;
     padding: 9px 10px 0;
     border: 1px solid #f4f0f0;
     border-radius: 5px;
     cursor: pointer;
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    transition: all .03s;
+    color: #f2f2f2;
 }
  
 .safe_driv_pop:hover{
@@ -949,15 +950,33 @@ option.oil_station_opt{
 }
  
 .safe_driv_pop .title{
-    font-weight: 600;
 }
  
-.safe_driv_pop i.uk-icon-times-circle{
+/*.safe_driv_pop i.uk-icon-times-circle{
     margin-right: 5px;
-}
+}*/
 .safe_driv_pop .desc{
     display: block;
     font-size: 12px;
-    margin: 2px 0 0 20px;
-    color: #e3e3e3;
-}
 \ No newline at end of file
+    color: #ff9d9d;
+    text-align: right;
+    margin-right: 5px;
+}
+
+/*.safe_driv_pop .detail_content{
+    display: none;
+}
+
+.safe_driv_pop.open .detail_content{
+    display: block;
+    background: rgb(255, 255, 255);
+    height: 200px;
+    margin: 7px 0;
+    border-radius: 5px;
+    color: #000000;
+}
+
+.safe_driv_pop.open .desc{
+    display: none;
+}*/
+/** 安全驾驶相关css结束 */
 \ No newline at end of file
@@ -97,6 +97,8 @@
                 <span class="uk-badge uk-badge-danger">直放</span>
                 {{else if sch.bcType == "major"}}
                 <span class="uk-badge uk-badge-danger">放站</span>
+                {{else if sch.bcType == "region"}}
+                <span class="uk-badge">区间</span>
                 {{/if}}
                 {{if sch.sflj}}
                 <span class="uk-badge uk-badge-danger">临加</span>
@@ -72,6 +72,8 @@
                                     <span class="uk-badge uk-badge-danger">直放</span>
                                     {{else if sch.bcType == "major"}}
                                     <span class="uk-badge uk-badge-danger">放站</span>
+                                    {{else if sch.bcType == "region"}}
+                                    <span class="uk-badge">区间</span>
                                     {{/if}}
                                     {{if sch.sflj}}
                                     <span class="uk-badge uk-badge-danger">临加</span>
@@ -119,6 +121,8 @@
             <span class="uk-badge uk-badge-danger">直放</span>
             {{else if bcType == "major"}}
             <span class="uk-badge uk-badge-danger">放站</span>
+            {{else if bcType == "region"}}
+            <span class="uk-badge">区间</span>
             {{/if}}
             {{if sflj}}
             <span class="uk-badge uk-badge-danger">临加</span>
-<div class="uk-modal" id="all-devices-modal">
+<div class="uk-modal ct_move_modal" id="all-devices-modal">
     <div class="uk-modal-dialog" style="width: 1100px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
+<div class="uk-modal ct_move_modal" id="safe_dring_list-modal" style="z-index: 99;">
+    <div class="uk-modal-dialog" style="width: 1100px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>安全驾驶图像信息（当日）</h2></div>
+
+            <div class="uk-panel uk-panel-box uk-panel-box-primary">
+                <form class="uk-form search-form">
+                    <fieldset data-uk-margin>
+                        <legend>
+                            数据检索
+                        </legend>
+                        <span class="horizontal-field">车辆</span>
+                        <div class="uk-autocomplete uk-form autocomplete-cars" >
+                            <input type="text" name="clzbh" placeholder="车辆自编号">
+                        </div>
+                        <span class="horizontal-field">异常类型</span>
+                        <select name="yczltype">
+                            <option value="">全部</option>
+                            <option value="A1">手部离开方向盘</option>
+                            <option value="A2">摄像头异常</option>
+                            <option value="A3">未戴安全带</option>
+                            <option value="A4">未戴袖章</option>
+                            <option value="A5">眨眼/疲劳驾驶</option>
+                            <option value="A6">打哈欠/打瞌睡</option>
+                            <option value="A7">行驶中与人交谈</option>
+                        </select>
+                        <button class="uk-button">检索</button>
+                    </fieldset>
+                </form>
+            </div>
+        <div style="height: 495px;margin:5px 0 -18px;">
+            <table class="ct-fixed-table uk-table uk-table-hover">
+                <thead>
+                <tr>
+                    <th style="width: 12%;">线路</th>
+                    <th style="width: 13%;">车辆自编号</th>
+                    <th style="width: 13%;">设备</th>
+                    <th style="width: 13%;">异常类型</th>
+                    <th style="width: 17%;">时间</th>
+                    <th style="width: 11%;">检查属性</th>
+                    <th style="width: 11%;">图像</th>
+                    <th>视频</th>
+                </tr>
+                </thead>
+                <tbody data-uk-observe>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="uk-modal-footer uk-text-right pagination-wrap">
+        </div>
+    </div>
+
+    <script id="all-safe_dring-table-temp" type="text/html">
+        {{each array as sd i}}
+        <tr>
+            <td style="width: 14%;">{{sd.xlmc}}</td>
+            <td style="width: 14%;">{{sd.clzbh}}</td>
+            <td style="width: 13%;">{{sd.sbbh}}</td>
+            <td style="width: 13%;">{{sd.yczlText}}</td>
+            <td style="width: 10%;">{{sd.timeStr}}</td>
+            <td style="width: 10%;">
+                {{if sd.yczltype=='A1'}}
+                    {{if sd.jctype==0}}
+                        双脱手
+                    {{else if sd.jctype==1}}
+                        单脱手
+                    {{/if}}
+                {{/if}}
+            </td>
+            <td style="width: 10%;">
+                <a class="image_link" href="{{sd.url}}.jpg" data-uk-lightbox="{group:'jpg_group1'}" title="{{sd.title}}">JPG</a>
+            </td>
+            <td>
+                <a class="image_link" href="{{sd.url}}.gif" data-uk-lightbox="{group:'gif_group2'}" title="{{sd.title}}">查看视频</a>
+            </td>
+        </tr>
+        {{/each}}
+    </script>
+
+    <script>
+        (function() {
+            var modal = '#safe_dring_list-modal';
+            var form = $('.search-form', modal);
+            var page = 0;
+            var pageSize = 12;
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+
+                query();
+            });
+
+            //sumit event
+            form.on('submit', function(e) {
+                e.preventDefault();
+                resetPagination = true;
+                page=0;
+                query();
+            });
+
+            var query = function() {
+                scanFlag = false;
+                var data = form.serializeJSON();
+                data.page = page;
+                data.size = pageSize;
+
+                gb_common.$get('/gps/safeDriv', data, function (rs) {
+                    //数据转换
+                    var code2Name=gb_data_basic.lineCode2NameAll(), url,stm, p;
+                    $.each(rs.list, function(){
+                        if(this.xlbm)
+                            this.xlmc=code2Name[this.xlbm];
+                        else
+                            this.xlmc='';
+                        stm = moment(this.ts);
+                        this.timeStr = stm.format('YYYY-MM-DD HH:mm:ss');
+                        this.yczlText= gb_safe_driv.safeCode[this.yczltype];
+                        //拼接图片地址
+                        p = (this.sbbh+'_'+this.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+                        url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
+                        this.url = gb_safe_driv.urlPath + url;
+                        //title
+                        this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczlText;
+                    });
+
+                    var bodyHtml = template('all-safe_dring-table-temp', {
+                        array: rs.list
+                    });
+                    $('table tbody', modal).html(bodyHtml);
+                    if (resetPagination)
+                        pagination(rs.totalPages + 1, rs.page);
+
+                    //扫描图片是否存在
+                    scanFlag = true;
+                    scanImgIsExist();
+                });
+            };
+
+            var scanFlag;
+            var scanImgIsExist = function () {
+                var array = $('table tbody a.image_link', modal);
+                var i = 0;
+                //匿名函数递归
+                (function () {
+                    //计数
+                    if(i >= array.length || !scanFlag){
+                        console.log('扫描图片结束');
+                        return;
+                    }
+                    var f = arguments.callee;
+                    var $a = $(array[i]);
+                    i ++;
+                    var img = new Image();
+                    img.onerror = function(){
+                        $a.removeAttr('href').removeAttr('data-uk-lightbox').text('无').css('color', '#b8b8b8');
+                        f();
+                    };
+                    img.onload = function(){
+                        f();
+                    };
+                    img.src=$a.attr('href');
+                })();
+            };
+
+            var resetPagination = true;
+            var pagination = function(pages, currentPage) {
+                var wrap = $('.pagination-wrap', modal).empty()
+                        ,e = $('<ul class="uk-pagination"></ul>').appendTo(wrap);
+
+                var pagination = UIkit.pagination(e, {
+                    pages: pages,
+                    currentPage: currentPage
+                });
+
+                e.on('select.uk.pagination', function(e, pageIndex){
+                    page = pageIndex;
+                    query();
+                });
+
+                resetPagination = false;
+            };
+        })();
+    </script>
+</div>
@@ -267,6 +267,11 @@
         "id": 3.4,
         "text": "轨迹回放",
         "event": "gps_play_back"
+      },
+      {
+        "id": 3.5,
+        "text": "安全驾驶(图像)",
+        "event": "safe_driving"
       }
     ]
   },
 //modal hide remove dom
 $(document).on('hide.uk.modal', '.uk-modal', function () {
+    //放过灯箱
+    if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-lightbox')){
+        return;
+    }
     $(this).remove();
 });
  
@@ -7,10 +11,6 @@ $(document).on(&#39;show.uk.modal&#39;, &#39;.uk-modal.ct_move_modal&#39;, function () {
     if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
         return;
  
-    /*    //临时放过轨迹回放
-     if($(this).attr('id')=='map-playback-modal')
-     return;*/
-
     //计算居中位置
     var win = $('body');
     var Y = (win.width() - $('.uk-modal-dialog', this).width()) / 2 - 10;
@@ -55,7 +55,6 @@ var modal_move = function (m_header) {
     var win = $('body');
  
     $(m_header).on('mousedown', function (e) {
-        console.log('mousedown');
         e.preventDefault();
         _moveFlag = true;
         _moveObj = $(this).parent();
@@ -188,6 +188,9 @@ var gb_northToolbar = (function () {
         },
         form_schedule_daily: function () {
             gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDaily.html', '调度工作日报表');
+        },
+        safe_driving: function () {
+            open_modal('/real_control_v2/fragments/north/nav/safeDriving.html', {}, modal_opts);
         }
     };
  
@@ -13,32 +13,49 @@ var gb_safe_driv = (function () {
         'A7': '与人交谈'
     };
  
+    var path = 'http://180.166.5.82:9988/CurrentSafeDriving/';
+
     var $wrap = $('.safe_driv_pop_wrap');
     var max = 5;
  
     var pop = function (sd) {
         //只有admin用户能收到
         var user = gb_northToolbar.user();
-        if(!user || user.userName.indexOf('admin') == -1)
+        if (!user || user.userName.indexOf('admin') == -1)
             return;
  
-        var htmlStr = '<div class="safe_driv_pop uk-animation-slide-bottom">'+
-            ' <span class="title"><i class="uk-icon-times-circle"></i>安全驾驶 '+moment(sd.ts).format('HH:mm')+'</span>'+
-            ' <span class="text"> '+sd.clzbh+' 违规驾驶（'+codes[sd.yczltype]+'）</span><span class="desc">请至安全驾驶监管平台查看图像信息</span>'+
-            '</div>';
-
+        //时间格式化
+        var stm = moment(sd.ts);
+        sd.timeStr = stm.format('HH时mm分ss秒');
+        //异常状态文本
+        sd.ycztText = codes[sd.yczltype];
+        //图片地址
+        var p = (sd.sbbh+'_'+sd.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+        var url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
+        sd.url = path + url + '.jpg';
+
+        var htmlStr = template('safe_driv_item-temp', sd);
         var items = $wrap.find('.safe_driv_pop'), len = items.length;
-        if(len >= max)
-            $wrap.find('.safe_driv_pop:lt('+(len - max)+')').remove();
+        if (len >= max)
+            $wrap.find('.safe_driv_pop:lt(' + (len - max) + ')').remove();
  
         $wrap.append(htmlStr);
     };
  
     $wrap.on('click', '.safe_driv_pop', function () {
+        var title = $(this).data('title');
+        var url = $(this).data('url');
         $(this).remove();
+        var lightbox = UIkit.lightbox.create([
+            {title: title, 'source': url}
+        ]);
+
+        lightbox.show();
     });
  
     return {
-        pop: pop
+        pop: pop,
+        safeCode: codes,
+        urlPath: path
     }
 })();
 \ No newline at end of file
@@ -11,6 +11,7 @@
     <link rel="stylesheet"
           href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css"/>
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css"/>
  
     <!-- main style -->
     <link rel="stylesheet" href="/real_control_v2/css/main.css"/>
@@ -60,7 +61,6 @@
     </div>
 </div>
  
-<div class="safe_driv_pop_wrap"></div>
 <script>
     delete window.exports;
     delete window.module;
@@ -123,6 +123,7 @@
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js"></script>
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js"></script>
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js"></script>
  
 <!-- jquery contextMenu -->
 <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"></script>
@@ -185,8 +186,21 @@
 <script src="/real_control_v2/js/forms/form_embed.js"></script>
 <!-- 模态框扩展 -->
 <script src="/real_control_v2/js/modal_extend.js"></script>
-<!-- 安全驾驶相关 -->
+
+<!-- #### 安全驾驶 start ###  -->
+<div class="safe_driv_pop_wrap" ></div>
+<script id="safe_driv_item-temp" type="text/html">
+    <div class="safe_driv_pop uk-animation-slide-bottom" data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
+        <div>
+            <span class="title">异常&nbsp;{{clzbh}}</span>
+            <span class="text"> {{timeStr}} 出现违规驾驶（{{ycztText}}）</span>
+            <span class="desc">--安全驾驶监管平台</span>
+        </div>
+    </div>
+</script>
+
 <script src="/real_control_v2/js/safe_driv/safeDriv.js" ></script>
+<!-- #### 安全驾驶 end ###  -->
 </body>
  
 </html>
@@ -818,8 +818,17 @@ input[type=checkbox].disabled{
     height: 100%;
 }
  
+.map-container.show_tools{
+    height: calc(100% - 63px);
+    margin-top: 63px;
+}
+
 #map-playback2-modal .uk-modal-close{
     z-index: 11;
+    background: #ff3333;
+    opacity: 1;
+    border-radius: 15px;
+    color: white;
 }
  
 .map-wrap-tools .ct-progress-bar{
@@ -828,6 +837,7 @@ input[type=checkbox].disabled{
     width: 100%;
     bottom: 0;
     cursor: pointer;
+    overflow: hidden;
     /*border-top: 5px solid white;*/
 }
  
@@ -866,7 +876,7 @@ input[type=checkbox].disabled{
 .map-wrap-tools .btns>.multi-items{
     display: inline-block;
     vertical-align: top;
-    background: #e7e4e4;
+    background: #f1f1f1;
     padding: 7px 15px;
     margin: 12px 5px;
     border-radius: 5px;
@@ -899,4 +909,16 @@ input[type=checkbox].disabled{
     font-size: 22px;
     color: #8b8686;
     margin-right: 10px;
+}
+
+.play_back_form_shade{
+    background: rgb(196, 194, 194);
+    position: absolute;
+    width: 98%;
+    height: 205px;
+    left: 2%;
+    z-index: 99;
+    top: 0;
+    opacity: .2;
+    display: none;
 }
 \ No newline at end of file
@@ -10,7 +10,8 @@
                 </div>
  
             </div>
-            <div class="uk-width-medium-2-10 uk-height-viewport z-depth-viewport ">
+            <div class="uk-width-medium-2-10 uk-height-viewport z-depth-viewport " style="position: relative;">
+                <div class="play_back_form_shade uk-animation-scale"></div>
                 <form class="uk-form uk-form-horizontal playBackForm">
                     <div class="uk-grid">
                         <div class="uk-width-1-1">
@@ -18,7 +19,9 @@
                                 <label class="uk-form-label">车辆编码</label>
                                 <div class="uk-form-controls">
                                     <div class="uk-autocomplete uk-form autocomplete-nbbm">
-                                        <input name="nbbm" required/>
+                                        <div class="uk-autocomplete uk-form autocomplete-nbbm">
+                                            <input name="nbbm" required/>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -137,43 +140,41 @@
                 <div class="map-wrap-tools uk-animation-slide-top">
                     <div class="btns">
                         <span class="ct_btn play_btn"></span>
-                        <span class="ct_btn clock">
-                            08:20.10
-                        </span>
+                        <span class="ct_btn clock"></span>
                         <div class="multi-items">
-                            <form class="uk-form">
+                            <form class="uk-form speed_form">
                                 <label>
-                                    <input type="radio" name="playSpeed"> x1
+                                    <input type="radio" name="playSpeed" value="1"> x1
                                 </label>
                                 <label>
-                                    <input type="radio" name="playSpeed"> x5
+                                    <input type="radio" name="playSpeed" value="5"> x5
                                 </label>
                                 <label>
-                                    <input type="radio" name="playSpeed"> x10
+                                    <input type="radio" name="playSpeed" value="10"> x10
                                 </label>
                                 <label>
-                                    <input type="radio" name="playSpeed"> x20
+                                    <input type="radio" name="playSpeed" value="20"> x20
                                 </label>
                             </form>
                         </div>
                         <div class="multi-items">
-                            <form class="uk-form">
+                            <form class="uk-form buffer_area_form">
                                 <label>
-                                    <input type="checkbox"> 站点
+                                    <input type="checkbox" name="drawPoint"> 站点
                                 </label>
                                 <label>
-                                    <input type="checkbox"> 缓冲区
+                                    <input type="checkbox" name="drawBuffArea"> 缓冲区
                                 </label>
                                 <label>
-                                    <input type="checkbox"> 站点名称
+                                    <input type="checkbox" name="stationName"> 站点名称
                                 </label>
                                 <label>
-                                    停车场 <i class="uk-icon-angle-down"></i>
+                                    <a>停车场 <i class="uk-icon-angle-down"></i></a>
                                 </label>
                             </form>
                         </div>
                         <span class="ct_btn text-panel">
-                            <span>约12.58公里，1258个GPS点</span><br>
+                            <span>共约 <span class="sum_mileage"></span> 公里，<span class="count_point"></span> 个GPS点</span><br>
                             <a class="export-excel"><i class="uk-icon-file-excel-o"></i> 导出轨迹</a>
                         </span>
                     </div>
@@ -211,7 +212,7 @@
  
     <script id="multi_inout_info_cont_temp" type="text/html">
         {{each list as item i}}
-        <dl>
+        <dl data-id="{{item.id}}">
             <dd>{{item.stopName}}</dd>
             <dd>{{item.in_time_str}}</dd>
             <dd>{{item.out_time_str}}</dd>
@@ -221,20 +222,31 @@
         {{/each}}
     </script>
  
+    <script id="inout_info_cont_temp" type="text/html">
+        <dl data-id="{{id}}">
+            <dd>{{stopName}}</dd>
+            <dd>{{in_time_str}}</dd>
+            <dd></dd>
+            <dd></dd>
+            <dd></dd>
+        </dl>
+    </script>
+
+
     <script id="abnormal_table_cont_temp" type="text/html">
         {{each array as item i}}
-            <dl>
-                <dd>
-                    {{if item.abnormalType == 'speed'}}
-                        超速({{item.speed}})
-                    {{else if item.abnormalType == 'outbound'}}
-                        越界
-                    {{/if}}
-                </dd>
-                <dd>{{item.st_str}}</dd>
-                <dd>{{item.et_str}}</dd>
-                <dd></dd>
-            </dl>
+        <dl>
+            <dd>
+                {{if item.abnormalType == 'speed'}}
+                超速({{item.speed}})
+                {{else if item.abnormalType == 'outbound'}}
+                越界
+                {{/if}}
+            </dd>
+            <dd>{{item.st_str}}</dd>
+            <dd>{{item.et_str}}</dd>
+            <dd></dd>
+        </dl>
         {{/each}}
     </script>
     <script>
@@ -242,15 +254,8 @@
             var modal = '#map-playback2-modal', gpsArray;
  
             $(modal).on('init', function (e, data) {
-                try {
-                    //初始化地图
-                    map = new BMap.Map($('.map-container', modal)[0]);
-                    //中心点和缩放级别
-                    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
-                    map.enableScrollWheelZoom();
-                } catch (e) {
-                    console.log(e);
-                }
+                //初始化地图
+                mapObj.initMap();
  
                 //固定表头
                 gb_ct_table.fixedHead($('.road_table_wrap', modal));
@@ -261,6 +266,11 @@
  
                 //表单初始值
                 searchForm.init(data);
+
+                //车辆 autocomplete
+                $.get('/basic/cars', function (rs) {
+                    gb_common.carAutocomplete($('.autocomplete-nbbm', modal), rs);
+                });
             });
  
             /**
@@ -306,95 +316,122 @@
              */
             var searchForm = (function () {
  
-                        var f = $('.playBackForm', modal);
-
-                        var init = function (data) {
-                            //设置初始值
-                            /*if (data.nbbm)
-                             $('[name=nbbm]', f).val(data.nbbm);
-                             var st = moment().subtract(2, 'hour');
-                             if (data.st)
-                             st = moment(data.st, 'YYYY-MM-DD HH:mm');
-                             $('[name=sDate]', f).val(st.format('YYYY-MM-DD'));
-                             $('[name=sTime]', f).val(st.format('HH:mm'));
-                             var et = moment();
-                             if (data.et)
-                             et = moment(data.et, 'YYYY-MM-DD HH:mm');
-                             $('[name=eDate]', f).val(et.format('YYYY-MM-DD'));
-                             $('[name=eTime]', f).val(et.format('HH:mm'));*/
-
-
-                            $('[name=nbbm]', f).val('W0A-018');
-                            $('[name=sDate]', f).val('2017-04-06');
-                            $('[name=sTime]', f).val('04:49');
-
-                            $('[name=eDate]', f).val('2017-04-06');
-                            $('[name=eTime]', f).val('09:49');
-                            //搜索事件
-                            $('button[type=submit]', f).on('click', search);
-                        };
-
-                        var setNbbm = function (v) {
-                            $('[name=nbbm]', f).val(v);
-                        };
-
-                        var ONE_DAY = 60 * 60 * 24;
-                        var MIN_SPACE = 60;
-                        var search = function (e) {
-                            e.stopPropagation();
-                            var data = f.serializeJSON();
-
-                            //校验时间间隔
-                            var fs = 'YYYY-MM-DDHH:mm';
-                            var st = parseInt(moment(data.sDate + data.sTime, fs).format('X'));
-                            var et = parseInt(moment(data.eDate + data.eTime, fs).format('X'));
-
-                            if (et < st)
-                                notify_err('结束时间不能小于开始时间');
-                            else if ((et - st) > ONE_DAY)
-                                notify_err('最大间隔24小时！');
-                            else if ((et - st) < MIN_SPACE)
-                                notify_err('最小间隔1分钟！');
-                            else {
-                                $.ajax({
-                                    url: '/gps/history_v2/' + data.nbbm,
-                                    traditional: true,
-                                    data: {st: st, et: et},
-                                    success: function (rs) {
-                                        gpsArray = rs.list;
-                                        if (!rs || rs.length == 0) {
-                                            notify_err('没有搜索到轨迹数据！');
-                                            return;
-                                        }
-
-                                        //排序
-                                        gpsArray.sort(function (a, b) {
-                                            return parseInt((a.ts - b.ts) + '' + (a.stop_no - b.stop_no));
-                                        });
-                                        //行车轨迹
-                                        trailTableObj.showInitData(gpsArray);
-                                        //到离站信息
-                                        inOutStationTableObj.showInitData(gpsArray);
-                                        //异常信息
-                                        abnormalTableObj.showInitData(rs['outboundList'], rs['speedList']);
-                                        //show 工具条
-                                        mapTools.show();
-                                    }
+                var f = $('.playBackForm', modal);
+
+                var init = function (data) {
+                    //设置初始值
+                    /*if (data.nbbm)
+                        $('[name=nbbm]', f).val(data.nbbm);
+                    var st = moment().subtract(2, 'hour');
+                    if (data.st)
+                        st = moment(data.st, 'YYYY-MM-DD HH:mm');
+                    $('[name=sDate]', f).val(st.format('YYYY-MM-DD'));
+                    $('[name=sTime]', f).val(st.format('HH:mm'));
+                    var et = moment();
+                    if (data.et)
+                        et = moment(data.et, 'YYYY-MM-DD HH:mm');
+                    $('[name=eDate]', f).val(et.format('YYYY-MM-DD'));
+                    $('[name=eTime]', f).val(et.format('HH:mm'));*/
+
+
+                    $('[name=nbbm]', f).val('W0A-018');
+                     $('[name=sDate]', f).val('2017-04-06');
+                     $('[name=sTime]', f).val('04:49');
+
+                     $('[name=eDate]', f).val('2017-04-06');
+                     $('[name=eTime]', f).val('09:49');
+                    //搜索事件
+                    $('button[type=submit]', f).on('click', search);
+                };
+
+                var setNbbm = function (v) {
+                    $('[name=nbbm]', f).val(v);
+                };
+
+                var ONE_DAY = 60 * 60 * 24;
+                var MIN_SPACE = 60;
+                var search = function (e) {
+                    e.stopPropagation();
+                    var data = f.serializeJSON();
+
+                    //校验时间间隔
+                    var fs = 'YYYY-MM-DDHH:mm';
+                    var st = parseInt(moment(data.sDate + data.sTime, fs).format('X'));
+                    var et = parseInt(moment(data.eDate + data.eTime, fs).format('X'));
+
+                    if (et < st)
+                        notify_err('结束时间不能小于开始时间');
+                    else if ((et - st) > ONE_DAY)
+                        notify_err('最大间隔24小时！');
+                    else if ((et - st) < MIN_SPACE)
+                        notify_err('最小间隔1分钟！');
+                    else {
+                        show_wait_modal('搜索数据...');
+                        $.ajax({
+                            url: '/gps/history_v2/' + data.nbbm,
+                            traditional: true,
+                            data: {st: st, et: et},
+                            success: function (rs) {
+                                hide_wait_modal();
+                                //重置相关对象
+                                playObj.reset();
+                                mapObj.reset();
+
+                                gpsArray = rs.list;
+                                if (!gpsArray || gpsArray.length == 0) {
+                                    notify_err('没有搜索到轨迹数据！');
+                                    return;
+                                }
+
+                                //排序
+                                gpsArray.sort(function (a, b) {
+                                    return parseInt((a.ts - b.ts) + '' + (a.stop_no - b.stop_no));
                                 });
+                                //行车轨迹
+                                trailTableObj.showInitData(gpsArray);
+                                //到离站信息
+                                inOutStationTableObj.showInitData(gpsArray);
+                                //异常信息
+                                abnormalTableObj.showInitData(rs['outboundList'], rs['speedList']);
+                                //show 工具条
+                                mapTools.show(rs);
+                                //地图
+                                mapObj.initData(rs);
+                                //play 对象
+                                playObj.init(rs);
+                                //设置导出文件名称
+                                mapTools.setExcelName();
                             }
-                            return false;
-                        };
-                        return {
-                            init: init,
-                            setNbbm: setNbbm
-                        };
-                    })();
+                        });
+                    }
+                    return false;
+                };
+
+                //遮罩
+                var shade = $('.play_back_form_shade', modal);
+                var showShade = function () {
+                    shade.show();
+                };
+                var hideShade = function () {
+                    shade.hide();
+                };
+
+                return {
+                    init: init,
+                    setNbbm: setNbbm,
+                    showShade: showShade,
+                    hideShade: hideShade
+                };
+            })();
  
             /**
              * 行车轨迹表格
              */
             var trailTableObj = (function () {
  
+                var $tbody = $('.gps-road-info .ct_table_body', modal);
+                var $wrap = $('.road_table_wrap', modal);
+                var initFlag, gpsArray;
                 var showInitData = function (list) {
                     var array = [];
                     for (var i = 0, gps; gps = list[i++];) {
@@ -412,11 +449,41 @@
                     }
  
                     var htmlStr = template('gps_road_info_cont_temp', {array: array});
-                    $('.gps-road-info .ct_table_body', modal).html(htmlStr);
+                    $tbody.html(htmlStr);
+                    initFlag = true;
+                    gpsArray = list;
+                };
+
+                var prev;
+                var add = function (gps, i) {
+                    if(i == 0)
+                        return;
+                    if(initFlag){
+                        //清理初始化的数据
+                        $tbody.html('');
+                        initFlag = false;
+                    }
+                    if (!gps.road)
+                        return;
+                    var code = gps.road.road_CODE;
+                    if (!prev || code != prev.road.road_CODE) {
+                        $tbody.append(template('gps_road_info_cont_temp', {array: [gps]}));
+                    }
+                    else{
+                        var dds = $tbody.find('dl[data-code=' + code + ']').last().find('dd');
+                        $(dds[0]).text(gps.timeStr);
+                        $(dds[1]).text(gps.speed);
+                    }
+                    prev = gps;
+                    $wrap.scrollTop($wrap[0].scrollHeight);
                 };
  
                 return {
-                    showInitData: showInitData
+                    showInitData: showInitData,
+                    add : add,
+                    gpsArray : function () {
+                        return gpsArray;
+                    }
                 };
             })();
  
@@ -426,21 +493,20 @@
              */
             var inOutStationTableObj = (function () {
  
-                var data, f, prev;
+                var data, f, prev, initFlag;
+                var $wrap = $('.inout_table_wrap', modal);
+                var $tbody = $('.ct_table_body', $wrap);
                 var showInitData = function (list) {
                     clear();
                     data = [];
-
                     $.each(list, function (i, gps) {
-
                         prev = data[data.length - 1];
                         if (gps['inout_stop'] == -1)
                             return true;
-
-                        if (gps['inout_stop'] == 0) {
+                        if (gps['inout_stop'] == 0 && gps['inout_stop_info']) {
                             //连续进站信号，取第一个
                             if(prev && prev['out_ts'] == null
-                                && prev['stopName'] == gps['inout_stop_info'].stopName){
+                                    && prev['stopName'] == gps['inout_stop_info'].stopName){
                                 return true;
                             }
                             data.push(createIn(gps));
@@ -451,37 +517,62 @@
                                 data.push(f);
                         }
                     });
-
                     //格式化时间
-                    $.each(data, function () {
+                    $.each(data, function (i) {
                         if (this.in_ts)
                             this.in_time_str = moment(this.in_ts).format('HH:mm.ss');
                         if (this.out_ts)
                             this.out_time_str = moment(this.out_ts).format('HH:mm.ss');
+                        //id
+                        this.id = 'in_out_' + i;
                     });
-
                     var htmlStr = template('multi_inout_info_cont_temp', {list: data});
-                    $('.inout_table_wrap .ct_table_body', modal).html(htmlStr);
+                    $tbody.html(htmlStr);
+                    initFlag = true;
+                    len = data.length;
                 };
  
-                var add = function (gps) {
+                var inoutIndex=0, len, item;
+                var add = function (gps, i) {
+                    if(i == 0)
+                        return;
+                    if(initFlag)
+                        clear();
+
+                    var $dl;
+                    for(j = inoutIndex; j < len; j++){
+                        item = data[j];
+                        $dl = $tbody.find('dl[data-id='+item.id+']');
+                        if(gps.ts >= item.in_ts && $dl.length==0){
+                            $tbody.append(template('inout_info_cont_temp', item));
+                            inoutIndex = j;
+                        }
  
+                        if(gps.ts >= item.out_ts){
+                            var dds = $dl.find('dd');
+                            if($dl.length==0)
+                                $tbody.append(template('inout_info_cont_temp', item));
+                            else
+                                $(dds[2]).text(item.out_time_str);
+                            inoutIndex = j;
+                        }
+                        else {
+                            break;
+                        }
+                    }
+                    $wrap.scrollTop($wrap[0].scrollHeight);
                 };
  
                 var clear = function () {
-
+                    $tbody.html('');
+                    initFlag = false;
                 };
  
                 var createIn = function (gps) {
                     var info = gps['inout_stop_info'];
-                    return {
-                        in_ts: info.ts,
-                        stopNo: info.stopNo,
-                        stopName: info.stopName
-                    }
+                    return {in_ts: info.ts, stopNo: info.stopNo, stopName: info.stopName}
                 };
  
-
                 var matchOut = function (prevInfo, gps) {
                     var oi = gps['inout_stop_info'];
                     if(prevInfo && prevInfo.stopName == oi.stopName){
@@ -489,16 +580,13 @@
                         return null;
                     }
                     else {
-                        return {
-                            out_ts: oi.ts,
-                            stopNo: oi.stopNo,
-                            stopName: oi.stopName
-                        }
+                        return {out_ts: oi.ts,stopNo: oi.stopNo,stopName: oi.stopName}
                     }
                 };
  
                 return {
-                    showInitData: showInitData
+                    showInitData: showInitData,
+                    add: add
                 };
             })();
  
@@ -515,12 +603,17 @@
                     }
                     //格式化时间
                     $.each(array, function () {
-                       if(this.st)
-                           this.st_str = moment(this.st).format('HH:mm.ss');
+                        if(this.st)
+                            this.st_str = moment(this.st).format('HH:mm.ss');
                         if(this.et)
                             this.et_str = moment(this.et).format('HH:mm.ss');
                     });
  
+                    //排序
+                    array.sort(function (a, b) {
+                        return a.st - b.st;
+                    });
+
                     var htmlStr = template('abnormal_table_cont_temp', {array: array});
                     $('.abnormal_table .ct_table_body', modal).html(htmlStr);
                 };
@@ -539,19 +632,382 @@
                     if($(this).hasClass('play')){
                         //暂停
                         $(this).removeClass('play');
+                        playObj.pause();
+                        searchForm.hideShade();
                     }
                     else {
                         //播放
                         $(this).addClass('play');
+                        playObj.play();
+                        playObj.fixedToCenter();
+                        searchForm.showShade();
                     }
                 });
  
-                var show = function () {
+                //播放速度
+                $('.speed_form input[name=playSpeed]', modal).on('click', function () {
+                    playObj.setConf('playSpeed', $(this).val());
+                });
+
+                //空间数据
+                $('.buffer_area_form input[type=checkbox]', modal).on('click', function () {
+                    playObj.setConf($(this).attr('name'), $(this)[0].checked);
+                    mapObj.refreshOverlay();
+                });
+
+                //进度条
+                var step, $scale = $('.ct-progress-bar .scale', modal);
+                var upProgressBar = function (i) {
+                    $scale.css('width', step * (i + 1));
+                };
+
+                //导出
+                $('.export-excel', modal).on('click', function () {
+                    var base64Str = gb_map_play_back.listToExcel(trailTableObj.gpsArray());
+                    $(this).attr('href', base64Str);
+                });
+
+                var setExcelName = function () {
+                    var f = $('.playBackForm', modal);
+                    var fileName = ($('[name=nbbm]', f).val() + '轨迹数据' + $('[name=sDate]', f).val() + $('[name=sTime]', f).val() + '至' + $('[name=eDate]', f).val() + $('[name=eTime]', f).val() + '.xls').replace(new RegExp(/-/g),'').replace(new RegExp(/:/g),'');
+                    $('.export-excel', modal).attr('download', fileName);
+                };
+
+                var gpsArray;
+                var show = function (rs) {
                     $('.map-wrap-tools').show();
+                    $('.map-container', modal).addClass('show_tools');
+                    //总里程
+                    $('.text-panel .sum_mileage', modal).text(rs.sumMileage);
+
+                    var size = rs.list.length;
+                    $('.text-panel .count_point', modal).text(size);
+                    step = $('.ct-progress-bar', modal).width() / size;
+
+                    //console.log('stepstep', step);
+                };
+
+                return {
+                    show: show,
+                    upProgressBar: upProgressBar,
+                    setExcelName: setExcelName
+                }
+            })();
+
+            /**
+             * 地图相关
+             */
+            var mapObj = (function () {
+                var map;
+                var initMap = function () {
+                    //初始化地图
+                    map = new BMap.Map($('.map-container', modal)[0]);
+                    //中心点和缩放级别
+                    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
+                    map.enableScrollWheelZoom();
+                }
+
+                var storage = window.localStorage;
+                var routes;//路段
+                var stations;//站点
+                var parks;//停车场
+
+                var initData = function (rs) {
+                    var gpsArray = rs.list;
+                    if(!gpsArray || gpsArray.length==0)
+                        return;
+                    var lineCode = gpsArray[0].lineId;
+                    //从地图模块获取站点数据
+                    stations = gb_map_spatial_data.getStationArray(lineCode);
+                    //从地图模块获取停车场数据
+                    parks = gb_map_spatial_data.carparkArray();
+                    //从localStorage 获取路段
+                    routes = JSON.parse(storage.getItem(lineCode + '_route'));
+                    routes = [routes.up_bd, routes.down_bd];
+                };
+
+
+                /**
+                 *  更新车辆位置
+                 */
+                var gpsMarker;
+                var updateCar = function (gps) {
+                    if(!gpsMarker){
+                        gpsMarker = new BMap.Marker(new BMap.Point(gps.bd_lon, gps.bd_lat));
+                        var width = gb_map_imap.calcGpsMarkerWidth(gps.nbbm);
+                        gpsMarker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
+                        gpsMarker.disableMassClear();//禁止marker被清除
+                        gpsMarker.setTop(true);
+                        map.addOverlay(gpsMarker);
+                        //居中
+                        map.panTo(gpsMarker.getPosition());
+                    }
+                    else{
+                        gpsMarker.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
+                        var width = gb_map_imap.calcGpsMarkerWidth(gps.nbbm);
+                        gpsMarker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
+                    }
+
+                    //更新路段底图
+                    if(gps.upDown!=roadUpdown){
+                        switchPolyline(gps.upDown);
+                        //清除轨迹线
+                        trailArray = [];
+                    }
+                };
+
+                /**
+                 * 绘制轨迹线
+                 */
+                var trailArray=[], trailPolyline;
+                var updateTrailLine = function () {
+                    trailArray.push(gpsMarker.getPosition());
+                    if(!trailPolyline){
+                        trailPolyline = new BMap.Polyline(trailArray, {strokeWeight: 3, strokeColor: '#000000'});
+                        trailPolyline.disableMassClear();//禁止trailPolyline被清除
+                        map.addOverlay(trailPolyline);
+                    }
+                    else{
+                        trailPolyline.setPath(trailArray);
+                    }
+                };
+
+                /**
+                 * 绘制路段底图（包括站点）
+                 */
+                var roadUpdown=-1;
+                var switchPolyline = function (upDown) {
+                    if(typeof(upDown) == "undefined")
+                        upDown = roadUpdown;
+
+                    map.clearOverlays();
+                    //路段
+                    drawRoadPolyline(upDown);
+                    //站点
+                    if(playObj.getConf().drawPoint)
+                        drawStationPoint(upDown);
+                    //缓冲区
+                    if(playObj.getConf().drawBuffArea)
+                        drawStationBfArea(upDown);
+                    //站点名称
+                    if(playObj.getConf().stationName)
+                        drawStationName(upDown);
+                    roadUpdown = upDown;
+                };
+
+                /**
+                 * 根据走向绘制路段
+                 */
+                var drawRoadPolyline = function (upDown) {
+                    var colour = gb_map_config.getConfig().section.color;
+                    var plConfig = {strokeWeight: 12, strokeColor: upDown?colour.down:colour.up, strokeOpacity: .4}, pos;
+                    $.each(routes[upDown], function (i, item) {
+                        pos = [];
+                        $.each(item.split(','), function () {
+                            temps = this.split(' ');
+                            pos.push(new BMap.Point(temps[0], temps[1]));
+                        });
+                        map.addOverlay(new BMap.Polyline(pos, plConfig));
+                    });
+                };
+
+                /**
+                 * 根据走向绘制站点点位
+                 */
+                var drawStationPoint = function (upDown) {
+                    var array = stations[upDown], psm;
+                    $.each(array, function () {
+                        //坐标转换
+                        var coord = TransGPS.wgsToBD(this.lat, this.lon);
+                        this.bd_lat = coord.lat;
+                        this.bd_lon = coord.lng;
+                        psm = new BMap.Marker(new BMap.Point(this.bd_lon, this.bd_lat));
+                        psm.setTitle(this.stationName);
+                        map.addOverlay(psm);
+                        psm.setIcon(new BMap.Icon(gb_map_imap.createStationPointIcon(), new BMap.Size(12, 12)));
+                    });
+                };
+
+                /**
+                 * 为站点绘制缓冲区
+                 */
+                var drawStationBfArea = function (upDown) {
+                    var array = stations[upDown];
+                    $.each(array, function () {
+                        if(this.shapesType=='r')
+                            drawCircle(new BMap.Point(this.bd_lon, this.bd_lat), this.radius);
+                        else if(this.shapesType=='d')
+                            drawPolygon(this);
+                    });
+                };
+
+                /**
+                 * 绘制站点名称
+                 */
+                var drawStationName = function (upDown) {
+                    var style = {backgroundColor: "rgba(255, 255, 255, 0.69)",color : "black", borderColor: "black", fontSize : "12px", height : "16px", lineHeight : "16px", fontFamily:"微软雅黑"}
+                    var array = stations[upDown];
+                    $.each(array, function () {
+                        var width = this.stationName.length * 12;
+                        var label = new BMap.Label(this.stationName, {
+                            position:new BMap.Point(this.bd_lon, this.bd_lat),
+                            offset: new BMap.Size(-(width / 2), -27)
+                        });
+                        label.setStyle(style);
+                        map.addOverlay(label);
+                    });
+                };
+                var drawCircle = function (point, radius) {
+                    var circle = new BMap.Circle(point, radius);
+                    circle.setStrokeColor('#000000');
+                    circle.setStrokeWeight(1);
+                    map.addOverlay(circle);
+                };
+
+                var drawPolygon = function () {
+
+                };
+
+                /**
+                 * 重置
+                 */
+                var reset = function () {
+                    if(trailPolyline)
+                        trailPolyline.enableMassClear();
+                    if(gpsMarker)
+                        gpsMarker.enableMassClear();
+                    map.clearOverlays();
+                    roadUpdown = -1;
+                    trailArray=[];
+                    trailPolyline = null;
+                    gpsMarker = null;
+                };
+
+                /**
+                 * 居中车辆，超出边界时
+                 */
+                var toCenterByBounds = function () {
+                    var markerIsVisible = BMapLib.GeoUtils.isPointInRect(gpsMarker.getPosition(),map.getBounds());
+                    if(!markerIsVisible)
+                        map.panTo(gpsMarker.getPosition());
+                };
+                return {
+                    initData: initData,
+                    updateCar: updateCar,
+                    initMap: initMap,
+                    updateTrailLine: updateTrailLine,
+                    refreshOverlay: switchPolyline,
+                    toCenterByBounds: toCenterByBounds,
+                    reset: reset
+                }
+            })();
+
+            /**
+             * 播放相关
+             * @type {{}}
+             */
+            var playObj = (function () {
+                var conf = {
+                    playSpeed: 1,//播放速度
+                    drawPoint: 1,//绘制站点
+                    drawBuffArea: 1 ,//缓冲区
+                    stationName: 0, //站点名称
+                    carPark: [] //停车场
+                };
+
+                var gpsArray;//gps点位集合
+                var init = function (rs) {
+                    gpsArray = rs.list;
+                    if(!gpsArray || gpsArray.length==0)
+                        return;
+
+                    len = gpsArray.length;
+                    //渲染配置信息
+                    renderConfig();
+                    //播放第一个点
+                    run();
+                };
+
+                var renderConfig = function () {
+                    $('.speed_form [name=playSpeed][value='+conf.playSpeed+']', modal)[0].checked = true;
+                    $('.buffer_area_form input[type=checkbox]', modal).each(function () {
+                        var name = $(this).attr('name');
+                        $(this)[0].checked = conf[name];
+                    });
+                };
+
+                /**
+                 * 播放函数
+                 */
+                var runTimer; //播放定时器
+                var toCenterTimer;//居中定时器
+                var index = 0; //gps下标
+                var play = function () {
+                    if(!run())
+                        runTimer = setTimeout(play, 1000 / conf.playSpeed);
+                };
+
+                /**
+                 * 定时居中
+                 */
+                var fixedToCenter = function () {
+                    toCenterTimer = setInterval(function () {
+                        mapObj.toCenterByBounds();
+                    }, 500);
+                };
+
+                var pause = function () {
+                    clearInterval(runTimer);
+                    runTimer = null;
+                    clearInterval(toCenterTimer);
+                    toCenterTimer = null;
                 };
  
+                var clock = $('.ct_btn.clock', modal), gps, len;
+                var run = function () {
+                    if(index == len){
+                        $('.map-wrap-tools .play_btn', modal).removeClass('play');
+                        pause();
+                        notify_succ('本次轨迹回放已结束！');
+                        searchForm.hideShade();
+                        return true;
+                    }
+                    gps = gpsArray[index];
+                    //更新GPS点位
+                    mapObj.updateCar(gps);
+                    //绘制轨迹线
+                    mapObj.updateTrailLine();
+                    //时间文本
+                    clock.text(gps.timeStr);
+                    //输出行车轨迹
+                    trailTableObj.add(gps, index);
+                    //输出到离站信息
+                    inOutStationTableObj.add(gps, index);
+                    //进度条
+                    mapTools.upProgressBar(index);
+                    index ++;
+                };
+
+                /**
+                 * 重置
+                 */
+                var reset = function () {
+                    index = 0;
+                    gpsArray = null;
+                    pause();
+                };
                 return {
-                    show: show
+                    init: init,
+                    getConf: function () {
+                        return conf;
+                    },
+                    setConf: function (k, v) {
+                        conf[k] = v;
+                    },
+                    play: play,
+                    fixedToCenter: fixedToCenter,
+                    pause: pause,
+                    reset: reset
                 }
             })();
         })();
@@ -203,7 +203,6 @@ var gb_map_gps_tree = (function () {
             if(this.nbbm.indexOf(v) != -1){
                 rs.push({
                     value: this.nbbm,
-                    lineName: '青浦1路',
                     stationName: this.stationName?this.stationName:'',
                     dateStr: this.dateStr
                 });
@@ -34,6 +34,7 @@ var gb_map_imap = (function () {
         busIcon: '/real_control_v2/assets/imgs/bus1-R.png',
         _color: color,
         createCarIconRotation: createCarIconRotation,
+        createStationPointIcon: createStationPointIcon,
         createStationIcon: createStationIcon,
         call: function (f, opts) {
             var instance = maps[currentMap].instance;
@@ -86,7 +87,7 @@ var gb_map_imap = (function () {
  
  
     //绘制车辆icon 带角度标示
-    function createCarIconRotation(gps, w) {
+/*    function createCarIconRotation(gps, w) {
         if (!w)
             w = 70;
  
@@ -119,6 +120,81 @@ var gb_map_imap = (function () {
         ctx.restore();
  
         return canvas.toDataURL();
+    }*/
+
+    function createCarIconRotation(gps, w) {
+        if (!w)
+            w = 70;
+
+        var canvas = $('<canvas></canvas>')[0];
+        canvas.width = w;
+        canvas.height = 64;
+        var ctx = canvas.getContext('2d');
+
+        var colours = color(gps);
+
+        ctx.roundRect(0, 0, w, 19, 4).stroke();
+        ctx.fillStyle = colours.bgColor;
+        ctx.fill();
+        //文字
+        ctx.font = "14px arial";
+        ctx.fillStyle = "#fff";
+        ctx.fillText(gps.nbbm, 2, 14);
+
+        //角度图标
+        //var img = new Image();
+        //img.src = rotationIcon(colours.bgColor);
+        ctx.save();
+        ctx.translate(canvas.width / 2, canvas.height / 2);
+        ctx.rotate(gps.direction * Math.PI / 180);
+        //ctx.drawImage(img, -img.width / 2, -img.width / 2);
+        /**
+         * 绘制角度图标
+         */
+        ctx.beginPath();
+        ctx.strokeStyle = colours.bgColor;
+        var circle = {
+            x: 0,    //圆心的x轴坐标值
+            y: 0,    //圆心的y轴坐标值
+            r: 12      //圆的半径
+        };
+        var d = 12.5;
+        //绘制圆形
+        ctx.arc(circle.x, circle.y, circle.r, 0, Math.PI * 2, true);
+        //按照指定的路径绘制弧线
+        ctx.stroke();
+        ctx.fillStyle = "#ffffff";
+        ctx.fill();
+        //下方矩形
+        ctx.beginPath();
+        ctx.fillStyle = colours.bgColor;
+        ctx.fillRect(5 - d, 16 - d, 15, 4);
+        ctx.rect(5 - d, 11 - d, 7.5, 8);
+        ctx.rect(12.5 - d, 11 - d, 7.5, 8);
+        ctx.strokeStyle = colours.bgColor;
+        ctx.stroke();
+        //上方三角形
+        ctx.beginPath();
+        ctx.fillStyle = "#111111";
+        ctx.moveTo(12.5 - d, 3 - d);
+        ctx.lineTo(6.5 - d, 7.5 - d);
+        ctx.lineTo(18.5 - d, 7.5 - d);
+        ctx.closePath();
+        ctx.fill();
+
+        ctx.restore();
+        return canvas.toDataURL();
+    }
+
+    //绘制站点点位icon
+    function createStationPointIcon() {
+        var canvas = $('<canvas></canvas>')[0];
+        var ctx = canvas.getContext('2d');
+        ctx.beginPath();
+        ctx.arc(6,6,6,0,2*Math.PI);
+        ctx.fillStyle = '#000000';
+        ctx.fill();
+        return canvas.toDataURL();
     }
  
  
@@ -136,7 +212,7 @@ var gb_map_imap = (function () {
             y: 12.5,    //圆心的y轴坐标值
             r: 12      //圆的半径
         };
-        //以canvas中的坐标点(100,100)为圆心，绘制一个半径为50px的圆形
+        //绘制圆形
         ctx.arc(circle.x, circle.y, circle.r, 0, Math.PI * 2, true);
         //按照指定的路径绘制弧线
         ctx.stroke();
@@ -29,7 +29,7 @@ var gb_map_play_back = (function () {
             '  <table border="1">' +
             '   <tr><th>序号</th><th>车辆</th><th>所在道路</th><th>经度</th><th>纬度</th><th>时间</th><th>速度</th></tr>' +
             '  {{each list as gps i}}' +
-            '   <tr><td>{{i+1}}</td><td>{{gps.nbbm}}</td><td>{{gps.road.ROAD_NAME}}</td><td>{{gps.bd_lon}}</td><td>{{gps.bd_lat}}</td><td>{{gps.timeStr2}}</td><td>{{gps.speed}}</td></tr>' +
+            '   <tr><td>{{i+1}}</td><td>{{gps.nbbm}}</td><td>{{gps.road.road_NAME}}</td><td>{{gps.bd_lon}}</td><td>{{gps.bd_lat}}</td><td>{{gps.timeStr}}</td><td>{{gps.speed}}</td></tr>' +
             '  {{/each}}' +
             '  </table>' +
             '    </body>' +
@@ -328,6 +328,12 @@ var gb_map_spatial_data = (function () {
         refresh: refresh,
         init: init,
         getCheckedStation:getCheckedStation,
-        gteCheckedCarpark: gteCheckedCarpark
+        gteCheckedCarpark: gteCheckedCarpark,
+        getStationArray: function (lineCode) {
+            return lineStationArr[lineCode];
+        },
+        carparkArray: function () {
+            return carparkArr;
+        }
     };
 })();
 \ No newline at end of file
+package com.bsth.service.schedule;
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * 基础测试类。
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = ScheduleTestApp.class)
+@ActiveProfiles("scheduletest")
+//@WebIntegrationTest({"server.port=0","management.port=0"})
+public class BaseTest {
+}
+package com.bsth.service.schedule;
+
+import com.bsth.service.schedule.impl.SchedulePlanRuleResultServiceImpl;
+import com.bsth.service.schedule.impl.SchedulePlanServiceImpl;
+import com.bsth.service.schedule.rules.MyDroolsConfiguration;
+import com.bsth.service.schedule.utils.DataToolsServiceImpl;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.orm.jpa.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+/**
+ * 基础测试类（用于计划调度模块测试测试）。
+ * 配置计划调度的模块的用到的entity，repository，service
+ *
+ * 注意：测试环境下测试类 TestApp 和springdata的类不在统一级包里，必须指定EnableJpaRepositories
+ */
+@Configuration
+@EntityScan(
+        basePackages = {"com.bsth.entity"}
+)
+@ComponentScan(
+        basePackages = {"com.bsth.repository", "com.bsth.service"},
+        useDefaultFilters = false,
+        includeFilters = {
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = SchedulePlanRuleResultServiceImpl.class
+                ),
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = SchedulePlanServiceImpl.class
+                ),
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = MyDroolsConfiguration.class
+                ),
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = DataToolsServiceImpl.class
+                )
+        }
+)
+@EnableJpaRepositories(
+        basePackages = {"com.bsth.repository"}
+)
+@SpringBootApplication
+public class ScheduleTestApp {
+}
-package com.bsth.service.schedule.rules;
-
-import com.bsth.Application;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
-import org.joda.time.DateTime;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.api.KieBase;
-import org.kie.api.runtime.KieSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.Arrays;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {Application.class})
-public class DroolsRulesTest {
-
-    /** 日志记录器 */
-    private final static Logger logger = LoggerFactory.getLogger(DroolsRulesTest.class);
-
-    @Autowired
-    private KieBase kieBase;
-
-//    @Test
-//    public void helloWorldDrlTest() throws Exception {
-//        // 1、创建session，内部配置的是stateful
-//        KieSession session = kieBase.newKieSession();
-//
-//        // 1.1 设置gloable对象，在drl中通过别名使用
-//        List<String> gloableList = new ArrayList<String>();
-//        session.setGlobal("list", gloableList);
-//
-//        // 1.2 可以设置一些监听器，再议
-//
-//        // 2、创建fact对象
-//        Message message = new Message();
-//        message.setMessage("Hello World");
-//        message.setStatus(Message.HELLO);
-//        session.insert(message);
-//
-//        // 3、执行rule
-//        session.fireAllRules();
-//
-//        System.out.println(gloableList);
-//
-//        // 4、执行完毕销毁，有日志的也要关闭
-//        session.dispose();
-//    }
-
-//    @Test
-    public void ttinfoDrlTest() throws Exception {
-        logger.info("------------ttinfoDrlTest 测试---------------");
-
-        // 1、创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-
-        // 1.1 设置gloable对象，在drl中通过别人使用
-        session.setGlobal("log", logger);
-        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
-        session.setGlobal("results", ttInfoResults_output);
-
-        // 1.2 可以设置一些监听器，再议
-
-        // 2、创建fact对象
-        TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
-                new DateTime(2016, 8, 1, 0, 0),
-                new DateTime(2016, 8, 10, 0, 0),
-                "1"
-        );
-
-
-        TTInfo_input ttInfo_input1 = new TTInfo_input();
-        ttInfo_input1.setTtInfoId("1");
-        ttInfo_input1.setXlId("1");
-        ttInfo_input1.setWeekdays(Arrays.asList(true, true, true, true, true, false, false));
-        ttInfo_input1.getSpecialDays().add(new DateTime(2016, 8, 1, 0, 0));
-        ttInfo_input1.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
-        ttInfo_input1.setIsEnable(true);
-        ttInfo_input1.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-
-        TTInfo_input ttInfo_input1_2 = new TTInfo_input();
-        ttInfo_input1_2.setTtInfoId("2");
-        ttInfo_input1_2.setXlId("1");
-        ttInfo_input1_2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
-        ttInfo_input1_2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
-        ttInfo_input1_2.setUpdateDate(new DateTime(2015, 2, 1, 0, 0));
-        ttInfo_input1_2.setIsEnable(true);
-        ttInfo_input1_2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-
-
-        TTInfoCalcuParam_input ttInfoCalcuParam_inpu2 = new TTInfoCalcuParam_input(
-                new DateTime(2016, 8, 1, 0, 0),
-                new DateTime(2016, 8, 10, 0, 0),
-                "2"
-        );
-
-        TTInfo_input ttInfo_input2 = new TTInfo_input();
-        ttInfo_input2.setTtInfoId("2");
-        ttInfo_input2.setXlId("2");
-        ttInfo_input2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
-        ttInfo_input2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
-        ttInfo_input2.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
-        ttInfo_input2.setIsEnable(true);
-        ttInfo_input2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-
-        session.insert(ttInfoCalcuParam_input);
-        session.insert(ttInfo_input1);
-        session.insert(ttInfo_input1_2);
-        session.insert(ttInfoCalcuParam_inpu2);
-        session.insert(ttInfo_input2);
-
-
-
-        // 3、执行rule
-        session.fireAllRules();
-
-        // 4、执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        // 打印global结果
-        logger.info(ttInfoResults_output.showTTInfoDesc1());
-
-    }
-
-    @Test
-    public void shiftloopDrlTest() throws Exception {
-        // 1、创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-
-        // 1.1 设置gloable对象，在drl中通过别名使用
-        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
-        session.setGlobal("scheduleResult", scheduleResults_output);
-
-        // 1.2 可以设置一些监听器，再议
-
-        // 2、创建fact对象
-
-        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input();
-        scheduleCalcuParam_input.setFromDate(new DateTime(2016, 8, 1, 0, 0));
-        scheduleCalcuParam_input.setToDate(new DateTime(2016, 8, 10, 0, 0));
-
-        ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();
-        scheduleRule_input1.setRuleId("1");
-        scheduleRule_input1.setQyrq(new DateTime(2016, 7, 22, 0, 0));
-        scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(
-                "9", "9" , "8" ,"8" ,"7" ,"7" ,"6" ,"6", "5", "5", "4", "4", "3", "3", "2", "2", "1", "1"));
-        scheduleRule_input1.setStartGbdIndex(3);
-        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList("1", "2"));
-        scheduleRule_input1.setStartEIndex(1);
-        scheduleRule_input1.setCarConfigId("1");
-
-//        ScheduleRule_input scheduleRule_input2 = new ScheduleRule_input();
-//        scheduleRule_input2.setRuleId(2L);
-//        scheduleRule_input2.setQyrq(new DateTime(2016, 7, 22, 0, 0));
-//        scheduleRule_input2.getGuideboardIds().addAll(Arrays.asList(
-//                1L, 1L, 2L, 2L, 3L, 3L, 4L, 4L, 5L, 5L, 6L, 6L, 7L, 7L, 8L, 8L, 9L, 9L, 10L, 10L,
-//                11L, 11L, 12L, 12L, 13L, 13L));
-//        scheduleRule_input2.setStartGbdIndex(7);
-//        scheduleRule_input2.getEmployeeConfigIds().addAll(Arrays.asList(11L, 12L));
-//        scheduleRule_input2.setStartEIndex(1);
-//        scheduleRule_input2.setCarConfigId(2L);
-
-        session.insert(scheduleCalcuParam_input);
-        session.insert(scheduleRule_input1);
-//        session.insert(scheduleRule_input2);
-
-
-        // 3、执行rule
-        session.fireAllRules();
-
-        // 4、执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        System.out.println(scheduleResults_output.showGuideboardDesc1());
-
-    }
-}
-package com.bsth.service.schedule.rules;
-
-import com.bsth.Application;
-import org.junit.runner.RunWith;
-import org.kie.api.KieBase;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * 测试类。
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {Application.class})
-@ComponentScan(basePackages = {"com.bsth.entity"})
-public class DroolsRulesTest2 {
-    @Autowired
-    private KieBase kieBase;
-
-    @org.junit.Test
-    public void test1() throws Exception {
-        System.out.println("dfdfdfdfd");
-    }
-
-}
+package com.bsth.service.schedule.rules;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.SysUserRepository;
+import com.bsth.service.schedule.BaseTest;
+import com.vividsolutions.jts.util.Assert;
+import org.dbunit.database.DatabaseConnection;
+import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
+import org.dbunit.operation.DatabaseOperation;
+import org.junit.After;
+import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import javax.sql.DataSource;
+
+public class RuleTest1 extends BaseTest {
+    /** 日志记录器 */
+    private static final Logger logger = LoggerFactory.getLogger(RuleTest1.class);
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private SysUserRepository sysUserRepository;
+
+    /**
+     * 初始化数据。
+     */
+    @Before
+    public void initData() throws Exception {
+        logger.info("载入数据......");
+
+        // 获取数据库连接
+        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
+        // 获取Dbunit数据源
+        Resource res = new ClassPathResource("testdata/d1.xml");
+        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
+        flatXmlDataSetBuilder.setColumnSensing(false);
+        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
+        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
+
+        // 载入数据
+        DatabaseOperation.CLEAN_INSERT.execute(iDatabaseConnection, iDataSet);
+    }
+
+    /**
+     * 清除数据。
+     */
+    @After
+    public void destoryData() throws Exception {
+        logger.info("清除数据......");
+        // 获取数据库连接
+        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
+        // 获取Dbunit数据源
+        Resource res = new ClassPathResource("testdata/d1.xml");
+        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
+        flatXmlDataSetBuilder.setColumnSensing(false);
+        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
+        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
+
+        // 清除数据
+        DatabaseOperation.DELETE_ALL.execute(iDatabaseConnection, iDataSet);
+    }
+
+    @org.junit.Test
+    public void t1() {
+        logger.info("t1()测试......");
+        SysUser sysUser = sysUserRepository.findOne(1);
+        Assert.equals("admin", sysUser.getUserName());
+    }
+}
+
+//
+//
+//package com.bsth.service.schedule.rules;
+//
+//        import com.bsth.Application;
+//        import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
+//        import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+//        import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+//        import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
+//        import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+//        import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
+//        import org.joda.time.DateTime;
+//        import org.junit.Test;
+//        import org.junit.runner.RunWith;
+//        import org.kie.api.KieBase;
+//        import org.kie.api.runtime.KieSession;
+//        import org.slf4j.Logger;
+//        import org.slf4j.LoggerFactory;
+//        import org.springframework.beans.factory.annotation.Autowired;
+//        import org.springframework.boot.test.SpringApplicationConfiguration;
+//        import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//        import java.util.Arrays;
+//
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@SpringApplicationConfiguration(classes = {Application.class})
+//public class DroolsRulesTest {
+//
+//    /** 日志记录器 */
+//    private final static Logger logger = LoggerFactory.getLogger(DroolsRulesTest.class);
+//
+//    @Autowired
+//    private KieBase kieBase;
+//
+////    @Test
+////    public void helloWorldDrlTest() throws Exception {
+////        // 1、创建session，内部配置的是stateful
+////        KieSession session = kieBase.newKieSession();
+////
+////        // 1.1 设置gloable对象，在drl中通过别名使用
+////        List<String> gloableList = new ArrayList<String>();
+////        session.setGlobal("list", gloableList);
+////
+////        // 1.2 可以设置一些监听器，再议
+////
+////        // 2、创建fact对象
+////        Message message = new Message();
+////        message.setMessage("Hello World");
+////        message.setStatus(Message.HELLO);
+////        session.insert(message);
+////
+////        // 3、执行rule
+////        session.fireAllRules();
+////
+////        System.out.println(gloableList);
+////
+////        // 4、执行完毕销毁，有日志的也要关闭
+////        session.dispose();
+////    }
+//
+//    //    @Test
+//    public void ttinfoDrlTest() throws Exception {
+//        logger.info("------------ttinfoDrlTest 测试---------------");
+//
+//        // 1、创建session，内部配置的是stateful
+//        KieSession session = kieBase.newKieSession();
+//
+//        // 1.1 设置gloable对象，在drl中通过别人使用
+//        session.setGlobal("log", logger);
+//        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
+//        session.setGlobal("results", ttInfoResults_output);
+//
+//        // 1.2 可以设置一些监听器，再议
+//
+//        // 2、创建fact对象
+//        TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
+//                new DateTime(2016, 8, 1, 0, 0),
+//                new DateTime(2016, 8, 10, 0, 0),
+//                "1"
+//        );
+//
+//
+//        TTInfo_input ttInfo_input1 = new TTInfo_input();
+//        ttInfo_input1.setTtInfoId("1");
+//        ttInfo_input1.setXlId("1");
+//        ttInfo_input1.setWeekdays(Arrays.asList(true, true, true, true, true, false, false));
+//        ttInfo_input1.getSpecialDays().add(new DateTime(2016, 8, 1, 0, 0));
+//        ttInfo_input1.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
+//        ttInfo_input1.setIsEnable(true);
+//        ttInfo_input1.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+//
+//        TTInfo_input ttInfo_input1_2 = new TTInfo_input();
+//        ttInfo_input1_2.setTtInfoId("2");
+//        ttInfo_input1_2.setXlId("1");
+//        ttInfo_input1_2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
+//        ttInfo_input1_2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
+//        ttInfo_input1_2.setUpdateDate(new DateTime(2015, 2, 1, 0, 0));
+//        ttInfo_input1_2.setIsEnable(true);
+//        ttInfo_input1_2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+//
+//
+//        TTInfoCalcuParam_input ttInfoCalcuParam_inpu2 = new TTInfoCalcuParam_input(
+//                new DateTime(2016, 8, 1, 0, 0),
+//                new DateTime(2016, 8, 10, 0, 0),
+//                "2"
+//        );
+//
+//        TTInfo_input ttInfo_input2 = new TTInfo_input();
+//        ttInfo_input2.setTtInfoId("2");
+//        ttInfo_input2.setXlId("2");
+//        ttInfo_input2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
+//        ttInfo_input2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
+//        ttInfo_input2.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
+//        ttInfo_input2.setIsEnable(true);
+//        ttInfo_input2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+//
+//        session.insert(ttInfoCalcuParam_input);
+//        session.insert(ttInfo_input1);
+//        session.insert(ttInfo_input1_2);
+//        session.insert(ttInfoCalcuParam_inpu2);
+//        session.insert(ttInfo_input2);
+//
+//
+//
+//        // 3、执行rule
+//        session.fireAllRules();
+//
+//        // 4、执行完毕销毁，有日志的也要关闭
+//        session.dispose();
+//
+//        // 打印global结果
+//        logger.info(ttInfoResults_output.showTTInfoDesc1());
+//
+//    }
+//
+//    @Test
+//    public void shiftloopDrlTest() throws Exception {
+//        // 1、创建session，内部配置的是stateful
+//        KieSession session = kieBase.newKieSession();
+//
+//        // 1.1 设置gloable对象，在drl中通过别名使用
+//        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
+//        session.setGlobal("scheduleResult", scheduleResults_output);
+//
+//        // 1.2 可以设置一些监听器，再议
+//
+//        // 2、创建fact对象
+//
+//        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input();
+//        scheduleCalcuParam_input.setFromDate(new DateTime(2016, 8, 1, 0, 0));
+//        scheduleCalcuParam_input.setToDate(new DateTime(2016, 8, 10, 0, 0));
+//
+//        ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();
+//        scheduleRule_input1.setRuleId("1");
+//        scheduleRule_input1.setQyrq(new DateTime(2016, 7, 22, 0, 0));
+//        scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(
+//                "9", "9" , "8" ,"8" ,"7" ,"7" ,"6" ,"6", "5", "5", "4", "4", "3", "3", "2", "2", "1", "1"));
+//        scheduleRule_input1.setStartGbdIndex(3);
+//        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList("1", "2"));
+//        scheduleRule_input1.setStartEIndex(1);
+//        scheduleRule_input1.setCarConfigId("1");
+//
+////        ScheduleRule_input scheduleRule_input2 = new ScheduleRule_input();
+////        scheduleRule_input2.setRuleId(2L);
+////        scheduleRule_input2.setQyrq(new DateTime(2016, 7, 22, 0, 0));
+////        scheduleRule_input2.getGuideboardIds().addAll(Arrays.asList(
+////                1L, 1L, 2L, 2L, 3L, 3L, 4L, 4L, 5L, 5L, 6L, 6L, 7L, 7L, 8L, 8L, 9L, 9L, 10L, 10L,
+////                11L, 11L, 12L, 12L, 13L, 13L));
+////        scheduleRule_input2.setStartGbdIndex(7);
+////        scheduleRule_input2.getEmployeeConfigIds().addAll(Arrays.asList(11L, 12L));
+////        scheduleRule_input2.setStartEIndex(1);
+////        scheduleRule_input2.setCarConfigId(2L);
+//
+//        session.insert(scheduleCalcuParam_input);
+//        session.insert(scheduleRule_input1);
+////        session.insert(scheduleRule_input2);
+//
+//
+//        // 3、执行rule
+//        session.fireAllRules();
+//
+//        // 4、执行完毕销毁，有日志的也要关闭
+//        session.dispose();
+//
+//        System.out.println(scheduleResults_output.showGuideboardDesc1());
+//
+//    }
+//}
+
-package com.bsth.service.schedule.rules;
-
-import org.apache.tika.Tika;
-
-import java.io.File;
-
-/**
- * Created by xu on 17/1/3.
- */
-public class Test {
-    public static void main(String[] args) throws Exception {
-        Tika tika = new Tika();
-        File file = new File("/Users/xu/Downloads/排班规则练习1.xls");
-
-        // application/vnd.ms-excel
-        // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-
-        String detecttype = tika.detect(file);
-        System.out.println(detecttype);
-
-
-    }
-}
+#嵌入式tomcat配置
+#server.port=9088
+#management.port= 9001
+#management.address= 127.0.0.1
+
+#JPA配置
+spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= true
+
+#数据库连接池配置
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password=
+
+#spring.datasource.driver-class-name= org.h2.Driver
+#spring.datasource.url= jdbc:h2:mem:bookstore;DB_CLOSE_ON_EXIT=FALSE
+#spring.datasource.username= sa
+#spring.datasource.password=
+
+spring.datasource.max-active=100
+spring.datasource.max-idle=8
+spring.datasource.min-idle=8
+spring.datasource.initial-size=5
+
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-connect=true
+spring.datasource.test-on-return=true
+spring.datasource.test-while-idle=true
+spring.datasource.validation-query=select 1
+
+# 配置数据导入导出用到的配置信息
+
+# 1、kettle配置文件路径（类路径）
+datatools.kettle_properties=/datatools/kettle.properties
+# 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
+#数据库ip地址
+datatools.kvars_dbip=127.0.0.1
+#数据库用户名
+datatools.kvars_dbuname=root
+#数据库密码
+datatools.kvars_dbpwd=
+#数据库库名
+datatools.kvars_dbdname=qp_control
+
+# 3、上传数据配置信息
+# 上传文件目录配置（根据不同的环境需要修正）
+datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
+# ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
+datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
+# 临时输出文件目录
+datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
+# 模版文件目录
+datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
+
+##---------------------------- 导入数据ktr ----------------------------##
+# 车辆信息导入ktr转换
+datatools.cars_datainputktr=/datatools/ktrs/carsDataInput.ktr
+# 人员信息导入
+datatools.employees_datainputktr=/datatools/ktrs/employeesDataInput.ktr
+# 路牌信息导入
+datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
+# 时刻表基础信息导入
+datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
+# 时刻表明细信息导入（元数据）
+datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
+# 时刻表明细编辑用数据
+datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
+# 时刻表明细信息导入
+datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
+# 时刻表明细信息导入2
+datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
+
+# 车辆配置信息导入
+datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
+# 人员配置信息导入
+datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.ktr
+
+# 排版规则信息导入
+datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr
+
+# 4、数据导出配置信息
+# 导出数据文件目录配置（根据不同的环境需要修正）
+datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
+
+##---------------------------- 导出数据ktr -----------------------------##
+# 车辆信息导出ktr转换
+datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
+# 人员信息导出ktr转换
+datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
+# 时刻表导出元数据ktr转换
+datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
+# 时刻表导出数据ktr转换
+datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
+# 排版规则导出数据ktr转换
+datatools.schedulerule_output=/datatools/ktrs/scheduleRuleDataOutput.ktr
+
+# 车辆配置信息导出ktr转换
+datatools.carsconfig_dataoutputktr=/datatools/ktrs/carsConfigDataOutput.ktr
+# 人员配置信息导出ktr转换
+datatools.employeesconfig_dataoutputktr=/datatools/ktrs/employeesConfigDataOutput.ktr
+
+# 路牌信息导出
+datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
+
+
+# TODO：
+
+
+
+
+
+
+
+
+<?xml version='1.0' encoding='UTF-8'?>
+<dataset>
+    <!-- 用户数据 -->
+    <bsth_c_sys_user id="1" user_name="admin" name="系统管理员" create_date="2000-01-01" enabled="1" last_login_date="2000-01-01" />
+
+</dataset>
 \ No newline at end of file