Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong

徐烜
2 parents f5fa9566 cdb2d69a
Showing 38 changed files with 1182 additions and 95 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/oil/YlxxbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/AbnormalStateProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/overspeed/GpsOverspeed.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/overspeed/OverspeedProcess.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
src/main/java/com/bsth/data/gpsdata_v2/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/java/com/bsth/service/oil/YlxxbService.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/base/geo_data_edit/css/mian.css
src/main/resources/static/pages/base/geo_data_edit/js/change_line.js
src/main/resources/static/pages/base/geo_data_edit/js/map.js
src/main/resources/static/pages/base/geo_data_edit/js/road_route.js
@@ -3,6 +3,8 @@ package com.bsth.controller.gps;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +28,9 @@ public class GpsController {
     @Autowired
     GpsService gpsService;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     @RequestMapping(value = "/real/all")
     public Map<String, Object> search(@RequestParam Map<String, Object> map,
                                       @RequestParam(defaultValue = "0") int page,
@@ -42,8 +48,17 @@ public class GpsController {
     }
     @RequestMapping(value = "/real/line")
-    public List<GpsEntity> findByLineCodes(@RequestParam String lineCodes) {
-        return gpsRealData.get(Splitter.on(",").splitToList(lineCodes));
+    public Map<String, Object> findByLineCodes(@RequestParam String lineCodes) {
+        Map<String, Object> rs = new HashMap();
+        List<String> lineArray = Splitter.on(",").splitToList(lineCodes);
+        //实时gps
+        List<GpsEntity> gpsList = gpsRealData.get(lineArray);
+
+        //超速信息
+        List<GpsOverspeed> overspeedList = overspeedProcess.findByLines(lineArray);
+        rs.put("gpsList", gpsList);
+        rs.put("overspeedList", overspeedList);
+        return rs;
     }
     @RequestMapping(value = "/allDevices")
@@ -65,4 +65,16 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 		return list;
 	}
+	@RequestMapping(value="/saveYlxxb",method = RequestMethod.POST)
+	public Map<String, Object> savejzl(@RequestParam Map<String, Object> map){
+		Map<String, Object> maps=new HashMap<>();
+		try {
+			maps = service.saveYlxxb(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return maps;
+	}
+	
 }
@@ -483,6 +483,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
 	}
+	
+	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
+	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapByIdQp(id);
+	}
 	/**
 	 * @Title: scheduleDaily
 package com.bsth.data.gpsdata_v2;
+import com.alibaba.fastjson.JSON;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
@@ -11,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 /**
  * 实时信号数据处理
@@ -38,7 +41,7 @@ public class DataHandleProcess {
     static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
-    final static int POOL_SIZE = 25;
+    final static int POOL_SIZE = 20;
     static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static CountDownLatch count;
@@ -73,9 +76,10 @@ public class DataHandleProcess {
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
             count = new CountDownLatch(ks.size());
-            List<Future> fRs = new ArrayList<>(ks.size());
+            logger.info(JSON.toJSONString(ks));
             for (Integer index : ks) {
-                threadPool.submit(new SignalHandleThread(dataListMap.get(index), count));
+                //logger.info("execute index: " + index);
+                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
             }
@@ -108,7 +112,13 @@ public class DataHandleProcess {
         public void run() {
             try {
                 Collections.sort(list, comp);
-                for (GpsEntity gps : list) {
+                //logger.info("sort end --" + Thread.currentThread().getName() + " -list size: " + list.size());
+
+                GpsEntity gps;
+                for(int i = 0,len = list.size(); i< len ;i ++){
+                    gps = list.get(i);
+
+                    //logger.info("run |--" + Thread.currentThread().getName() + " -i: " + i);
                     try {
                         if (StringUtils.isEmpty(gps.getNbbm()))
                             continue;
@@ -123,16 +133,21 @@ public class DataHandleProcess {
                         inStationProcess.process(gps);//进站
                         outStationProcess.process(gps);//出站
+
+                        //logger.info("put start --" + Thread.currentThread().getName() + " -i: " + i);
                         GpsCacheData.putGps(gps);//历史gps缓存
-                    } catch (Exception e) {
+                        //logger.info("put end --" + Thread.currentThread().getName() + " -i: " + i);
+                    } catch (Throwable e) {
                         logger.error("", e);
                     }
                 }
+                //logger.info("for end --" + Thread.currentThread().getName() + " -list size: " + list.size());
+
             } finally {
                 if (count != null)
                     count.countDown();
-                logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
+                //logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
             }
         }
     }
@@ -3,8 +3,10 @@ package com.bsth.data.gpsdata_v2.handlers;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.entity.CtLineString;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import com.bsth.util.Geo.Point;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -17,19 +19,18 @@ import java.util.List;
 public class AbnormalStateProcess {
     /**
-     * 默认限速
-     */
-    private static final double DEFAULT_SPEED_LIMIT = 60;
-    /**
      * 越界阈值
      */
     private static final double OUT_BOUNDS_THRESHOLD = 100;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     public void process(GpsEntity gps) {
         if (isOffline(gps))
             return;
-        if (overspeed(gps))
+        if (overspeedProcess.process(gps))
             return;
         if (outOfBounds((gps)))
@@ -41,14 +42,14 @@ public class AbnormalStateProcess {
     }
-    /**
+/*    *//**
      * 是否超速
      *
      * @param gps
      * @return
-     */
+
     private boolean overspeed(GpsEntity gps) {
-        double maxSpeed = DEFAULT_SPEED_LIMIT;
+        *//*double maxSpeed = DEFAULT_SPEED_LIMIT;
         if (GeoCacheData.speedLimit(gps.getLineId()) != null)
             maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
@@ -56,8 +57,9 @@ public class AbnormalStateProcess {
             gps.setAbnormalStatus("overspeed");
             return true;
         }
-        return false;
-    }
+        return false;*//*
+        return overspeedProcess.process(gps);
+    }*/
     /**
+package com.bsth.data.gpsdata_v2.handlers.overspeed;
+
+/**
+ * gps 超速信息
+ * Created by panzhao on 2018/1/9.
+ */
+public class GpsOverspeed {
+
+    private String device;
+
+    private String nbbm;
+
+    private String lineCode;
+
+    /**
+     * 开始超速时间 HH:mm
+     */
+    private String sts;
+
+    private long st;
+
+    /**
+     * 结束超速时间 HH:mm
+     */
+    private String ets;
+
+    /**
+     * 最新速度值
+     */
+    private float speed;
+
+    /**
+     * 0：结束超速， 1：离线
+     */
+    private int eType;
+
+    public String getDevice() {
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getSts() {
+        return sts;
+    }
+
+    public void setSts(String sts) {
+        this.sts = sts;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public String getEts() {
+        return ets;
+    }
+
+    public void setEts(String ets) {
+        this.ets = ets;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public int geteType() {
+        return eType;
+    }
+
+    public void seteType(int eType) {
+        this.eType = eType;
+    }
+}
+package com.bsth.data.gpsdata_v2.handlers.overspeed;
+
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 超速处理
+ * Created by panzhao on 2018/1/9.
+ */
+@Component
+public class OverspeedProcess {
+
+
+    private static final double DEFAULT_SPEED_LIMIT = 60;
+
+    private static final double INVALID_SPEED_LIMIT = 110;
+
+    private static final int CONT_SPEED_SIZE = 6;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    private static GpsOverspeedComp comp = new GpsOverspeedComp();
+    /**
+     * 按线路分组的超速信息
+     */
+    private static ArrayListMultimap<String, GpsOverspeed> multimap;
+
+    /**
+     * 设备号 --> 当前超速
+     */
+    private static Map<String, GpsOverspeed> realOverspeedMap;
+
+    /**
+     * 设备号 --> 连续超速次数
+     */
+    private static Map<String, Integer> contSpeedMap;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    static{
+        multimap = ArrayListMultimap.create();
+        contSpeedMap = new HashMap();
+        realOverspeedMap = new HashMap();
+    }
+
+    public static void clear(){
+        multimap = null;
+        multimap = ArrayListMultimap.create();
+
+        contSpeedMap = null;
+        contSpeedMap = new HashMap();
+
+        realOverspeedMap = null;
+        realOverspeedMap = new HashMap();
+    }
+
+    public boolean process(GpsEntity gps){
+        if(gps.getSpeed() >= INVALID_SPEED_LIMIT){
+            return false;//无效的速度
+        }
+
+        Double maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
+        if(null == maxSpeed)
+            maxSpeed = DEFAULT_SPEED_LIMIT;
+
+        if(gps.getSpeed() > maxSpeed){
+            overspeed(gps, maxSpeed);
+        }
+        else if(realOverspeedMap.containsKey(gps.getDeviceId())){
+            String device = gps.getDeviceId();
+            //结束超速
+            GpsOverspeed sp = realOverspeedMap.get(device);
+            sp.setEts(fmtHHmm.print(gps.getTimestamp()));
+
+            realOverspeedMap.remove(device);
+            contSpeedMap.put(device, 0);
+        }
+        return false;
+    }
+
+    private void overspeed(GpsEntity gps, Double maxSpeed) {
+        String device = gps.getDeviceId();
+        Integer cont = contSpeedMap.get(device);
+
+        if(null == cont)
+            cont = 1;
+
+        cont++;
+
+        if(gps.getSpeed() - maxSpeed > (maxSpeed * 0.1))
+            cont++;
+
+        if(cont >= CONT_SPEED_SIZE){
+            if(realOverspeedMap.containsKey(device)){
+                //正在超速，更新速度
+                realOverspeedMap.get(device).setSpeed(gps.getSpeed());
+            }
+            else{
+                logger.info("开始超速..." + gps.getNbbm());
+                GpsOverspeed sp = new GpsOverspeed();
+                sp.setLineCode(gps.getLineId());
+                sp.setDevice(device);
+                sp.setSpeed(gps.getSpeed());
+                sp.setNbbm(gps.getNbbm());
+                sp.setSts(fmtHHmm.print(gps.getTimestamp()));
+                sp.setSt(gps.getTimestamp());
+
+                realOverspeedMap.put(device, sp);
+                multimap.put(sp.getLineCode(), sp);
+            }
+            //标记gps超速
+            gps.setAbnormalStatus("overspeed");
+        }
+
+        contSpeedMap.put(device, cont);
+    }
+
+    /**
+     * 设备掉线
+     * @param device
+     */
+    public void offline(String device){
+        if(realOverspeedMap.containsKey(device)){
+            //结束超速
+            GpsOverspeed sp = realOverspeedMap.get(device);
+            sp.setEts(fmtHHmm.print(System.currentTimeMillis()));
+            sp.seteType(1);
+
+            realOverspeedMap.remove(device);
+            contSpeedMap.put(device, 0);
+        }
+    }
+
+
+    public List<GpsOverspeed> findByLines(List<String> lineArray){
+        List<GpsOverspeed> rs = new ArrayList<>();
+
+        for(String code : lineArray){
+            rs.addAll(multimap.get(code));
+        }
+
+        //按发送时间排序
+        Collections.sort(rs, comp);
+        if(rs.size() > 50)
+            rs = rs.subList(0, 50);
+
+        return rs;
+    }
+
+
+    public static class GpsOverspeedComp implements Comparator<GpsOverspeed>{
+
+        @Override
+        public int compare(GpsOverspeed o1, GpsOverspeed o2) {
+            return (int) (o2.getSt() - o1.getSt());
+        }
+    }
+}
@@ -51,8 +51,8 @@ public class GatewayHttpLoader implements ApplicationContextAware{
         httpClient = HttpClients.createDefault();
         get = new HttpGet(url);
         requestConfig = RequestConfig.custom()
-                .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
-                .setSocketTimeout(1500).build();
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
         get.setConfig(requestConfig);
     }
@@ -44,8 +44,8 @@ public class SocketClientLoader {
         httpClient = HttpClients.createDefault();
         get = new HttpGet(url);
         requestConfig = RequestConfig.custom()
-                .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
-                .setSocketTimeout(1500).build();
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
         get.setConfig(requestConfig);
     }
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata_v2.thread;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.websocket.handler.SendUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +29,9 @@ public class OfflineMonitorThread extends Thread{
     @Autowired
     SendUtils sendUtils;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     //无任务时 离线阈值
     //private final static int OFFLINE_TIME = 1000 * 60 * 10;
@@ -47,6 +51,8 @@ public class OfflineMonitorThread extends Thread{
                 if (t - gps.getTimestamp() > LOSE_TIME){
                     gps.offline();
+                    //结束超速
+                    overspeedProcess.offline(gps.getDeviceId());
                     //通知页面有设备掉线
                     sendUtils.deviceOffline(gps);
                 }
 package com.bsth.data.schedule.thread;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
@@ -38,6 +39,8 @@ public class CalcOilThread extends Thread{
             logger.info("计算班次准点率结束！");
             //清除安全驾驶数据 先临时蹭这个线程
             SafeDrivCenter.clear();
+            //清除超速缓存数据
+            OverspeedProcess.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
@@ -688,10 +688,11 @@ public class GeoDataServiceImpl implements GeoDataService {
             //重新排序路由
             for (int i = 0, size = routes.size(); i < size; i++) {
                 sr = routes.get(i);
-                sr.setStationRouteCode(no += step);
+                sr.setStationRouteCode(no);
+                no += step;
                 if (sr.getId().intValue() == prevRouteId) {
-                    no += step;
                     currentNo = no;
+                    no += step;
                 }
             }
@@ -817,11 +818,22 @@ public class GeoDataServiceImpl implements GeoDataService {
             String sql = "update bsth_c_ls_stationroute set destroy=1 where id=?";
             jdbcTemplate.update(sql, station.getId());
-            //重新排序路由，标记mark
+            /**
+             * ########## 重新排序路由，标记mark #########
+             */
             sql = "select * from bsth_c_ls_stationroute where line_code='" + station.getLineCode() + "' and directions=" + station.getDirections() + " and destroy=0 and versions=" + station.getVersions();
             List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
             Collections.sort(routes, new StationRouteComp());
+            int no = 0,
+                    step = 100;
+            SaveStationRouteDTO sr;
+            //重新排序路由
+            for (int i = 0, size = routes.size(); i < size; i++) {
+                sr = routes.get(i);
+                sr.setStationRouteCode(no += step);
+            }
+
             for (int i = 0, size = routes.size(); i < size; i++) {
                 routes.get(i).setStationMark("Z");
             }
@@ -14,5 +14,7 @@ public interface YlxxbService extends BaseService&lt;Ylxxb, Integer&gt;{
 	Map<String, Object> checkJsy(Map<String, Object> map) throws Exception;
 	Map<String, Object> checkNbbm(Map<String, Object> map) throws Exception;
+	
+	Map<String, Object> saveYlxxb(Map<String, Object> map);
 }
@@ -268,4 +268,23 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		}
 		return newMap;
 	}
+	@Override
+	public Map<String, Object> saveYlxxb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		try{
+			Integer id=Integer.parseInt(map.get("id").toString());
+			Ylxxb t=repository.findOne(id);
+			t.setJzl(Double.parseDouble(map.get("jzl").toString().trim()));
+			t.setNbbm(map.get("nbbm").toString().trim());
+			t.setJsy(map.get("jsy").toString().trim());
+			repository.save(t);
+			newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		return newMap;
+	}
 }
@@ -144,6 +144,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String,Object> historySave(ScheduleRealInfo sch);
     Map<String, Object> MapById(Long id) ;
+    Map<String, Object> MapByIdQp(Long id) ;
+
     Map<String,Object> svgAttr(String jsonStr);
@@ -3732,22 +3732,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         //计算里程和班次数，并放入Map里
-        map = new HashMap<String, Object>();
+        map = findKMBCQp(clZbh, date, line);
         map.put("jzl", jzl);
-        map.put("jhlc", format.format(jhlc + jcclc));
-        map.put("yygljh", format.format(jhlc));
-        map.put("ssgl", format.format(remMileage));
-        map.put("ksgl", format.format(ksgl));
-        map.put("yyglsj", format.format(yygl));
-        map.put("jhbc", jhbc);
-        map.put("jcclc", jcclc);
-
-        map.put("ljgl", format.format(addMileage));
-        map.put("ssbc", cjbc);
-        map.put("ysgl", format.format(yygl));
-        map.put("sjbc", jhbc - cjbc + ljbc);
-        map.put("zgl", format.format(yygl + ksgl + jcclc));
-        map.put("ljbc", ljbc);
+//        map.put("jhlc", format.format(jhlc + jcclc));
+//        map.put("yygljh", format.format(jhlc));
+//        map.put("ssgl", format.format(remMileage));
+//        map.put("ksgl", format.format(ksgl));
+//        map.put("yyglsj", format.format(yygl));
+//        map.put("jhbc", jhbc);
+//        map.put("jcclc", jcclc);
+//
+//        map.put("ljgl", format.format(addMileage));
+//        map.put("ssbc", cjbc);
+//        map.put("ysgl", format.format(yygl));
+//        map.put("sjbc", jhbc - cjbc + ljbc);
+//        map.put("zgl", format.format(yygl + ksgl + jcclc));
+//        map.put("ljbc", ljbc);
+        
         String zdp = "", zwdp = "", wdp = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         List<DutyEmployee> listDtuy = dutyEmployeeService.getDutyEmployee(line, date + "00:00", date + "23:59");
@@ -4006,6 +4007,141 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dbdp", dbdp);
         return map;
     }
+    
+    @Override
+    public Map<String, Object> MapByIdQp(Long id) {
+        // TODO Auto-generated method stub
+        Map<String, Object> map = new HashMap<String, Object>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
+        String xlbm = s.getXlBm();
+        String fcrq = s.getScheduleDateStr();
+
+        int type=0;
+        Double ccyl = 0.0;
+        Double jcyl = 0.0;
+        Double yh = 0.0;
+        Double jzl = 0.0;
+        Double zlc=0.0;
+//        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+//        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+//        if(listYlb.size()>0){
+//        	 type=0;
+//        	for (int i = 0; i < listYlb.size(); i++) {
+//                Ylb y = listYlb.get(i);
+//                if(y.getLp()==null){
+//                	ccyl=Arith.add(ccyl, y.getCzyl());
+//                    jcyl=Arith.add(jcyl, y.getJzyl());
+//                    yh =Arith.add(yh ,y.getYh());
+//                    jzl =Arith.add(jzl, y.getJzl());
+//                    zlc =Arith.add(zlc, y.getZlc());
+//                }else{
+//                	if(y.getLp().equals(s.getLpName())){
+//                		ccyl=Arith.add(ccyl, y.getCzyl());
+//                        jcyl=Arith.add(jcyl, y.getJzyl());
+//                        yh =Arith.add(yh ,y.getYh());
+//                        jzl =Arith.add(jzl, y.getJzl());
+//                        zlc =Arith.add(zlc, y.getZlc());
+//                	}
+//                }
+//                
+//            }
+//        }else{
+//        	 type=1;
+//        	for (int i = 0; i < listDlb.size(); i++) {
+//				Dlb d=listDlb.get(i);
+//				if(d.getLp()==null){
+//					ccyl=Arith.add(ccyl, d.getCzcd());
+//	                jcyl=Arith.add(jcyl, d.getJzcd());
+//	                yh =Arith.add(yh ,d.getHd());
+//	                jzl =Arith.add(jzl, d.getCdl());
+//	                zlc =Arith.add(zlc, d.getZlc());
+//				}else{
+//					if(d.getLp().equals(s.getLpName())){
+//						ccyl=Arith.add(ccyl, d.getCzcd());
+//		                jcyl=Arith.add(jcyl, d.getJzcd());
+//		                yh =Arith.add(yh ,d.getHd());
+//		                jzl =Arith.add(jzl, d.getCdl());
+//		                zlc =Arith.add(zlc, d.getZlc());
+//					}
+//				}
+//				
+//			}
+//        }
+        
+        List<Ylxxb> listylxxb=ylxxbRepository.queryListYlxxb(s.getClZbh(), fcrq);
+        for (int i = 0; i < listylxxb.size(); i++) {
+        	Ylxxb t=listylxxb.get(i);
+            jzl =Arith.add(jzl, t.getJzl());
+		}
+        map.put("jzl", jzl);
+        map.put("yh", yh);
+        map.put("ccyl", ccyl);
+        map.put("jcyl", jcyl);
+        map.put("type", type);
+        map.put("zlc", zlc);
+        map.put("xlName", s.getXlName());
+        map.put("clZbh", s.getClZbh());
+        map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
+        map.put("fcsjActual", s.getFcsjActual());
+        map.put("zdzName", s.getZdzName());
+        map.put("scheduleDate", s.getScheduleDateStr());
+        map.put("lpName", s.getLpName());
+        String zdp = "", zwdp = "", wdp = "";
+        String zdpT = "", zwdpT = "", wdpT = "";
+        String dbdp="";
+        List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(xlbm, fcrq + "00:01", fcrq + "23:59");
+        try {
+            Long fcsj1 = sdf.parse(fcrq + " 00:01").getTime();
+            Long fcsj2 = sdf.parse(fcrq + " 11:00").getTime();
+            Long fcsj3 = sdf.parse(fcrq + " 23:59").getTime();
+            for (int i = 0; i < list.size(); i++) {
+                DutyEmployee t = list.get(i);
+                if(dbdp.indexOf(t.getuName()) == -1){
+                    if(!(dbdp.length()>0)){
+                        dbdp  =t.getuName();
+                    }else{
+                        dbdp +=","+t.getuName();
+                    }
+                }
+                Long ts = t.getTs();
+                if (ts > fcsj1 && ts < fcsj2) {
+                    if (zdp.indexOf(t.getuName()) == -1) {
+                        if (!(zdp.length() > 0)) {
+                            zdpT = t.getuName() + "...";
+                        }
+                        zdp += t.getuName() + ",";
+
+                    }
+                } else if (ts > fcsj2 && ts < fcsj3) {
+                    if (zwdp.indexOf(t.getuName()) == -1) {
+                        if (!(zwdp.length() > 0)) {
+                            zwdpT = t.getuName() + "...";
+                        }
+                        zwdp += t.getuName() + ",";
+                    }
+                } else {
+                    if (wdp.indexOf(t.getuName()) == -1) {
+                        if (!(wdp.length() > 0)) {
+                            wdpT = t.getuName() + "...";
+                        }
+                        wdp += t.getuName() + ",";
+                    }
+                }
+            }
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        map.put("zdp", zdp);
+        map.put("zwdp", zwdp);
+        map.put("wdp", wdp);
+        map.put("zdpT", zdpT);
+        map.put("zwdpT", zwdpT);
+        map.put("wdpT", wdpT);
+        map.put("dbdp", dbdp);
+        return map;
+    }
     @Override
     public List<Map<String, Object>> scheduleDailyQp(String line, String date) {
@@ -734,11 +734,42 @@ div[id*=&#39;PanoramaFlashWraperTANGRAM&#39;]{
     text-align: center;
     color: red;
 }
-/*
-div[id*='PanoramaFlashWraperTANGRAM']:before{
-    content: "如果你使用的是chrome浏览器，请在设置里允许当前页面IP启用flash";
-    position: absolute;
-    top: 50px;
-    left: calc(50% - 220px);
-    font-size: 18px;
-}*/
+
+._line_name a{
+    color: #484848;
+}
+
+.clock_enable_version:empty{
+    display: none;
+}
+
+.line_change_panel ul>li>div{
+    display: inline-block;
+    font-size: 14px;
+}
+
+.line_change_panel div.name{
+    width: 140px;
+}
+
+.line_change_panel div.code{
+    font-size: 12px;
+    font-family: 'Roboto Mono',monospace;
+    color: #f0506e;
+    white-space: nowrap;
+    padding: 2px 6px;
+    background: #f8f8f8;
+}
+
+.line_change_panel ul>li:hover{
+    background: #f8f8f8;
+    cursor: pointer;
+}
+
+.line_change_panel .uk-list>li:nth-child(n+2),.line_change_panel .uk-list>li>ul{
+    margin-top: 0;
+}
+
+.line_change_panel .uk-list>li{
+    padding: 5px;
+}
 \ No newline at end of file
+/**
+ * 线路切换面板
+ */
+
+var gb_change_line = (function () {
+
+    var data;
+
+    var init = function () {
+
+        var ep = EventProxy.create("findLine", "findCompanyData", function (lines, comps) {
+            //根据公司权限过滤线路
+            var lineArray = [];
+            for(var i=0,line;line=lines[i++];){
+                if(comps.indexOf(line.company + '_' + line.brancheCompany)){
+                    //拼音映射
+                    lineArray.push({
+                        name: line.name,
+                        code: line.lineCode,
+                        came: pinyin.getCamelChars(line.name),
+                        full: pinyin.getFullChars(line.name).toUpperCase()
+                    });
+                }
+            }
+
+            data = lineArray;
+
+            //按更新时间排序
+            lineArray.sort(function (a, b) {
+               return b.updateDate - a.updateDate;
+            });
+
+            //渲染页面
+            var htmlStr = template('geo_d_e_dropdown_list-temp', {list: lineArray.slice(0, 10), ellipsis: lineArray.length > 10});
+            $('.line_change_panel ul.uk-list').html(htmlStr);
+        });
+
+        $.get('/line/all', {destroy_eq: 0}, function (rs) {
+            ep.emit('findLine', rs);
+        });
+
+        $.get('/user/companyData', {}, function (rs) {
+            var filters = [];
+            for(var i=0,obj;obj=rs[i++];){
+
+                for(var j=0,sCom;sCom=obj.children[j++];){
+                    filters.push(obj.companyCode + '_' + sCom.code);
+                }
+            }
+            ep.emit('findCompanyData', filters);
+        });
+    };
+
+    /**
+     * 线路搜索
+     */
+    var search_k;
+    var search_flag;
+    $('.line_change_panel #line_search_input').on('input', function () {
+        search_k = $(this).val();
+        if(search_flag)
+            return;
+        search_flag = true;
+
+        setTimeout(function () {
+            _search(search_k);
+            search_flag = false;
+        }, 300);
+    });
+
+    function _search(v) {
+        v = v.toUpperCase();
+        var rs = [], ellipsis;
+        for(var i=0,obj;obj=data[i++];){
+            if(obj.came.indexOf(v)!=-1
+                || obj.full.indexOf(v)!=-1
+                || obj.name.indexOf(v)!=-1)
+                rs.push(obj);
+
+            if(rs.length >= 10){
+                ellipsis = true;
+                break;
+            }
+        }
+
+        var htmlStr = template('geo_d_e_dropdown_list-temp', {list: rs, ellipsis: ellipsis});
+        $('.line_change_panel ul.uk-list').empty().html(htmlStr);
+    }
+
+    /**
+     * 点击切换线路 data-code
+     */
+    $('.line_change_panel ul.uk-list').on('click', 'li[data-code]', function () {
+        var lineCode = $(this).data('code');
+        storage.setItem('geo_data_edit_line_code' , lineCode);
+        storage.removeItem('geo_data_edit_line_version');
+
+        $loadPanel.show();
+        clearAll();
+        startup();
+    });
+
+    return {
+        init: init
+    };
+})();
 \ No newline at end of file
@@ -320,8 +320,10 @@ var gb_ct_map = function () {
                 break;
             }
         }
+        var point = new BMap.Point(p.ct_data.cp.longitude, p.ct_data.cp.latitude);
+        openRoadInfoWin(p, point);
-        openRoadInfoWin(p, new BMap.Point(p.ct_data.cp.longitude, p.ct_data.cp.latitude));
+        map.setCenter(point);
     };
     var exitEditBufferStatus = function (s) {
@@ -869,6 +871,7 @@ var gb_ct_map = function () {
             editCircle = null;
             editPolygon = null;
             dragMarker = null;
+            initFlag = false;
             map.clearOverlays();
@@ -28,7 +28,7 @@ var gb_road_route = function () {
         });
         //加载数据
-        var version = storage.getItem("geo_data_edit_line_version");
+        var version = g_version;
         gb_common.$get('/_geo_data/findGeoRoad', {lineCode: lineCode,version:version}, function (rs) {
             rs.list.sort(function (a, b) {
                 return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode);
@@ -88,7 +88,7 @@ var gb_road_route = function () {
     var focus = function (data) {
         clearFocus();
         //sectionCode
-        var elem = $('.up_down_route_list>li>.road_route .r_r_item a[data-code='+data.sectionCode+']');
+        var elem = $('.up_down_route_list>li.uk-active>.road_route .r_r_item a[data-code='+data.sectionCode+']');
         elem = elem.parent();
         elem.addClass('ct_active');
@@ -5,7 +5,7 @@ var gb_station_route = function () {
     var station_maps;
     //绘制线路路由
     var init = function (cb) {
-        var lineCode = storage.getItem("geo_data_edit_line_code");
+        var lineCode = g_line_code;
         var ep = EventProxy.create("data", "temp", function (data, temp) {
             station_maps = data;
@@ -25,7 +25,7 @@ var gb_station_route = function () {
             cb && cb();
         });
-        var version = storage.getItem("geo_data_edit_line_version");
+        var version = g_version;
         //加载数据
         gb_common.$get('/_geo_data/findGeoStations', {lineCode: lineCode, version: version}, function (rs) {
             rs.list.sort(function (a, b) {
@@ -35,6 +35,7 @@ var gb_station_route = function () {
             //线路当前启用的线路版本
             storage.setItem("geo_data_enable_version" , rs['currentVersion']);
             //当前编辑的线路版本
+            g_version = rs['editVersion'];
             storage.setItem("geo_data_edit_line_version" , rs['editVersion']);
             var data = {0:[],1:[]};
@@ -69,8 +69,8 @@ var gb_data_submit = function () {
         data.stationName = $.trim(data.stationName);
         UIkit.modal.confirm('确定新增站点【'+data.stationName+'】？').then(function() {
-            data.lineCode = storage.getItem('geo_data_edit_line_code');
-            data.versions = storage.getItem('geo_data_edit_line_version');
+            data.lineCode = g_line_code;
+            data.versions = g_version;
             data.upDown = getUpDown();
             data.prevRouteId = gb_station_route.getAddPrevId();
             data.lng = data.gLonx;
@@ -98,8 +98,8 @@ var gb_data_submit = function () {
         var data = f.serializeJSON();
         UIkit.modal.confirm('确定新增路段【'+data.sectionName+'（'+data.crosesRoad+'）】？').then(function() {
-            data.lineCode = storage.getItem('geo_data_edit_line_code');
-            data.versions = storage.getItem('geo_data_edit_line_version');
+            data.lineCode = g_line_code;
+            data.versions = g_version;
             data.upDown = getUpDown();
             data.prevRouteId = gb_road_route.getAddPrevId();
@@ -162,11 +162,12 @@ var gb_data_submit = function () {
     $(document).on('click', '#add_line_versions_modal ._submit', function (e) {
         var f = $('form', '#add_line_versions_modal');
         var data = f.serializeJSON();
-        data.lineCode = storage.getItem('geo_data_edit_line_code');
+        data.lineCode = g_line_code;
         UIkit.modal.confirm('确定线路版本【'+data.name+'】？').then(function() {
             $loadPanel.show();
             gb_common.$post('/_geo_data/addNewLineVersion', data, function (rs) {
+                g_version = rs['newVersion'];
                 storage.setItem("geo_data_edit_line_version", rs['newVersion']);
                 clearAll();
                 startup();
@@ -9,7 +9,7 @@ var gb_version_manage = function () {
     var temps;
     var init = function (enableVersion) {
-        var lineCode = storage.getItem("geo_data_edit_line_code");
+        var lineCode = g_line_code;
         var ep = EventProxy.create("data", "temp", function () {
             if(!current){
@@ -17,7 +17,7 @@ var gb_version_manage = function () {
             }
             //线路名称
-            $('.main_left_panel>._line_info>._line_name>span').text(lineName);
+            $('.main_left_panel>._line_info>._line_name>.dropdown_txt').text(lineName);
             //当前版本
             $('.main_left_panel ._version_dropdown_wrap>._version_text')
                 .html(current.name + '<i uk-icon="icon: chevron-down;ratio:.6"></i>').removeClass('e0 e1 e2').addClass('e' + current.status);
@@ -126,7 +126,7 @@ var gb_version_manage = function () {
     $(document).on('click', v_e_edit_modal + ' button._submit', function () {
         var f = $('form', v_e_edit_modal);
         var data = f.serializeJSON();
-        data.lineCode = storage.getItem('geo_data_edit_line_code');
+        data.lineCode = g_line_code;
         gb_common.$post('/_geo_data/addEnableInfo', data, function () {
             UIkit.modal(v_e_edit_modal).hide();
@@ -257,7 +257,7 @@ var gb_version_manage = function () {
     $(document).on('click', '#enable_line_versions_modal button._submit', function () {
         var f = $('form', '#enable_line_versions_modal');
         var data = f.serializeJSON();
-        data.lineCode = storage.getItem('geo_data_edit_line_code');
+        data.lineCode = g_line_code;
         gb_common.$post('/_geo_data/addEnableInfo', data, function () {
             UIkit.modal('#enable_line_versions_modal').hide();
@@ -25,7 +25,14 @@
     <div class="main_left_panel">
         <div class="_line_info">
             <div class="_line_name">
-                <span></span>
+                <a class="dropdown_txt"></a>
+                <div class="line_change_panel" uk-dropdown="mode: click">
+                    <div class="uk-inline">
+                        <a class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></a>
+                        <input class="uk-input" type="text" id="line_search_input">
+                    </div>
+                    <ul class="uk-list"></ul>
+                </div>
                 <a uk-icon="icon: trash" class="remove_line_version_icon uk-animation-slide-right-small" title="删除线路版本" style="display: none" uk-tooltip></a>
                 <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路版本" uk-tooltip></a>
@@ -45,7 +52,6 @@
                 <li><a>上行</a></li>
                 <li><a>下行</a></li>
-                <!--<span class="rt_show_version_txt uk-badge uk-disabled uk-animation-slide-top-small"></span>-->
             </ul>
             <ul class="uk-switcher uk-margin up_down_route_list">
@@ -92,6 +98,18 @@
         {{/if}}
     </ul>
 </script>
+
+<script id="geo_d_e_dropdown_list-temp" type="text/html">
+    {{each list as obj i}}
+    <li data-code="{{obj.code}}">
+        <div class="name">{{obj.name}}</div>
+        <div class="code">{{obj.code}}</div>
+    </li>
+    {{/each}}
+    {{if ellipsis}}
+        <li>...</li>
+    {{/if}}
+</script>
 <!-- 百度 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
@@ -116,6 +134,7 @@
 <!-- flatpickr -->
 <script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<script src="/assets/plugins/pinyin.js"></script>
 <script>
     var $loadPanel = $('body>.loading');
@@ -147,9 +166,15 @@
     var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route'
             , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () {
                 startup();
+
+                gb_change_line.init();
             });
+    var g_line_code;
+    var g_version;
     var startup = function () {
+        g_line_code = storage.getItem('geo_data_edit_line_code');
+
         gb_main_ep = new EventProxy();
         var eq = gb_main_ep;
@@ -221,6 +246,8 @@
 <script src="/pages/base/geo_data_edit/js/map.js" ></script>
 <script src="/pages/base/geo_data_edit/js/submit.js" ></script>
 <script src="/pages/base/geo_data_edit/js/search.js" ></script>
+<script src="/pages/base/geo_data_edit/js/change_line.js" ></script>
+
 <script type="text/javascript"
         src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 </body>
@@ -173,7 +173,7 @@
 			var id = $("#"+params[0]).val();
-			$get('/realSchedule/MapById',{id:id},function(result){
+			$get('/realSchedule/MapByIdQp',{id:id},function(result){
 // 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',{map:result});
 				//var ludan_4 = template('ludan_4',result);
+<div class="page-head">
+    <div class="page-title">
+        <h1>进出场存油量</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">进出场存油量</span></li>
+</ul>
+
+<div class="row" id="ll_oil_list">
+    <div class="col-md-12">
+        <!-- Begin: life time stats -->
+        <div class="portlet light portlet-fit portlet-datatable bordered">
+            <div class="portlet-title">
+                <div class="caption">
+                    <i class="fa fa-fire-extinguisher"></i> <span
+                        class="caption-subject font-dark sbold uppercase">进出场存油量表</span>
+                </div>
+                <div class="actions">
+                    <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+                    	<button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
+<!--                     <button type="button" class="btn btn-circle blue" id="sortButton"><i class="fa fa-minus-square"></i> -->
+<!--                         拆分/保存 -->
+<!--                     </button> -->
+                    <!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
+                    <div class="btn-group">
+                        <a class="btn red btn-outline btn-circle" href="javascript:;"
+                           data-toggle="dropdown"> <i class="fa fa-share"></i> <span
+                                class="hidden-xs"> 系统工具 </span> <i class="fa fa-angle-down"></i>
+                        </a>
+                        <ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
+                            <li><a href="javascript:;" data-action="0"
+                                   class="tool-action" id="obtain"> <i class="fa fa-hourglass-half"></i> 获取加/存油信息
+                            </a></li>
+                            <li><a href="javascript:;" data-action="1"
+                                   class="tool-action" id="outAndIn"> <i class="fa fa-pencil"></i> 油耗计算（进场=出场）
+                            </a></li>
+                            <li><a href="javascript:;" id="checkYl" data-action="3"
+                                   class="tool-action"> <i class="fa fa-gg-circle"></i>
+                                核对加注量（有加油无里程）
+                            </a></li>
+                            <li class="divider"></li>
+                            <li><a href="javascript:;" data-action="3"
+                                   class="tool-action" id="export"> <i class="fa fa-file-excel-o"></i>
+                                导出Excel
+                            </a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <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_ylxxb">
+                        <thead>
+                        <tr role="row" class="filter">
+                       
+                            <td>
+                                	日期:
+                            </td>
+                            <td>
+                                <input type="text" style="width: 80px" name="yyrq_eq" id="yyrq"/>
+                            </td>
+                          
+                            <td >
+                              	  内部编码:
+                            </td>
+                            <td colspan="3">
+                                <input type="text" class="form-control" name="nbbm_like" id="nbbm" style="width: 120px;"></input>
+                            </td>
+                            <td colspan="4">
+                                <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
+                                    <i class="fa fa-search"></i> 搜索
+                                </button>
+
+                                <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px">
+                                    <i class="fa fa-times"></i> 重置
+                                </button>
+
+                            </td>
+                        </tr>
+                        <tr role="row" class="heading">
+                            <th >#</th>
+                            <th >日期</th>
+                            <th >自编号</th>
+                            <th >加油量</th>
+                            <th >驾驶员</th>
+                            <th >加油类型</th>
+                            <!-- 								<th width="5%">操作</th> -->
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                    <div style="text-align: right;">
+                        <ul id="pagination" class="pagination"></ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="ylxxb_list_temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+            <input type="radio" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
+        </td>
+
+        <td>
+            {{obj.yyrq}}
+        </td>
+        <td>
+			<input type="text"  data-id="{{obj.id}}" class="in_ylxx_nbbm" value="{{obj.nbbm}}">
+        </td>
+        <td>
+			<input type="text"  data-id="{{obj.id}}" class="in_ylxx_jzl" value="{{obj.jzl}}">
+        </td>
+        <td>
+			<input type="text"  data-id="{{obj.id}}" class="in_ylxx_jsy" value="{{obj.jsy}}">
+        </td>
+        <td>
+            {{obj.jylx}}
+        </td>
+        <td>
+
+<button type="button" class="btn btn-sm blue btn-ylxxbList" 
+			data-id="{{obj.id}}">保存</button>        </td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=20><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
+
+<script>
+    $(function () {
+        $("#yyrq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'iradio_square-blue icheck',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter .filter-cancel').on('click', function () {
+            $('tr.filter input, select').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+            if ($("#yyrq").val() == "" || $("#yyrq").val() ==null){
+            	  layer.msg('请选择日期.');
+            }else {
+                var cells = $('tr.filter')[0].cells
+                        , params = {}
+                        , name;
+                $.each(cells, function (i, cell) {
+                    var items = $('input,select', cell);
+                    for (var j = 0, item; item = items[j++];) {
+                        name = $(item).attr('name');
+                        if (name) {
+                            params[name] = $(item).val();
+                        }
+                    }
+                });
+                page = 0;
+                jsDoQuery(params, true);
+            } 
+        });
+    	
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            //更新时间排序
+            params['order'] = 'nbbm';
+            params['page'] = page;
+            params['rq'] = $("#rq").val();
+            
+            var i = layer.load(2);
+            $get('/ylxxb', params, function (data) {
+                $.each(data.content, function (i, obj) {
+                    obj.yyrq = moment(obj.yyrq).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('ylxxb_list_temp', {list: data.content});
+
+                $('#datatable_ylxxb tbody').html(bodyHtm)
+                        .find('.icheck').iCheck(icheckOptions)
+                        .on('ifChanged', iCheckChange);
+                if (pagination && data.content.length > 0) {
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                }
+				$('.btn-ylxxbList').on('click', saveYlxxbList);
+                layer.close(i);
+
+            });
+        }
+        function showPagination(data) {
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+
+                    var cells = $('tr.filter')[0].cells
+                            , params = {}
+                            , name;
+                    $.each(cells, function (i, cell) {
+                        var items = $('input,select', cell);
+                        for (var j = 0, item; item = items[j++];) {
+                            name = $(item).attr('name');
+                            if (name) {
+                                params[name] = $(item).val();
+                            }
+                        }
+                    });
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+        function saveYlxxbList(){
+			var id = $(this).data('id');
+			var jsy=$('.in_ylxx_jsy[data-id='+id+']', '#datatable_ylxxb').val();
+			var nbbm=$('.in_ylxx_nbbm[data-id='+id+']', '#datatable_ylxxb').val();
+			var jzl=$('.in_ylxx_jzl[data-id='+id+']', '#datatable_ylxxb').val();
+			 var i = layer.load(2);
+       	 	 $post('/ylxxb/saveYlxxb', {id:id,nbbm:nbbm,jsy:jsy,jzl:jzl}, function () {
+            	layer.close(i);
+                $('tr.filter .filter-submit').click();
+            }); 
+        }
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+
+            /* if($('#datatable_resource input.icheck:checked').length == 1)
+             $('#removeButton').removeAttr('disabled');
+             else
+             $('#removeButton').attr('disabled', 'disabled');  */
+        }
+
+       
+
+        //删除
+        $('#removeButton').on('click', function () {
+            if ($(this).attr('disabled'))
+                return;
+
+            var id = $('input.icheck:checked').data('id');
+            removeConfirm('确定要删除选中的数据？', '/ylxxb/' + id, function () {
+                $('tr.filter .filter-submit').click();
+            });
+        });
+
+
+    });
+</script>
 \ No newline at end of file
@@ -41,7 +41,7 @@ var gb_data_gps = (function () {
             upDownChange = [];
         var schArray;
-        $.each(rs, function () {
+        $.each(rs.gpsList, function () {
             old = realData[this.deviceId];
             if (old) {
                 if (this.timestamp > old.timestamp) {
@@ -54,12 +54,12 @@ var gb_data_gps = (function () {
             } else
                 addArr.push(this);
-           /* //班次信息
+            //班次信息
             if (this.schId) {
                 schArray = gb_schedule_table.findScheduleByLine(this.lineId);
                 if (schArray)
                     this.sch = schArray[this.schId];
-            }*/
+            }
             //时间格式化
             this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
@@ -69,9 +69,12 @@ var gb_data_gps = (function () {
         //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
         //CCCallFuncN
         $.each(refreshEventCallbacks, function (i, cb) {
-            cb(addArr, upArr, upDownChange);
+            cb(addArr, upArr, upDownChange, rs.overspeedList);
         });
+        //超速数据回调
+        //console.log('超速,,,', rs.overspeedList);
+
     };
     var startFixedTime;
@@ -1754,4 +1754,50 @@ dl.active&gt;dd.disabled{
     vertical-align: bottom;
     color: #ff2f2f;
     text-decoration: underline;
+}
+
+.c_b_abnorm_notice {
+    position: absolute;
+    bottom: 0;
+    margin: auto;
+    width: 351px;
+    padding: 7px;
+    background: #ffffff;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+    max-height: 290px;
+    overflow-y: auto;
+    min-height: 40px;
+}
+
+.c_b_abnorm_notice:before{
+    content: "-超速报警-";
+    color: #000000;
+    font-size: 12px;
+    font-family: 微软雅黑;
+    position: fixed;
+    background: #ffd967;
+    margin-top: -10px;
+    margin-left: -6px;
+    padding: 0 7px;
+    box-shadow: 2px 4px 7px rgba(90, 90, 90, 0.25);
+}
+
+.c_b_item {
+    margin: 7px 0;
+    padding: 7px 12px;
+    box-shadow: 0px 0px 10px rgba(90, 90, 90, 0.29);
+    color: #FF5722;
+    cursor: pointer;
+}
+
+.c_b_abnorm_notice>.c_b_item:first-child{
+    margin-top: 20px;
+}
+
+.c_b_item.over{
+    color: grey;
+}
+
+.c_b_item>span.c_b_over{
+    float: right;
 }
 \ No newline at end of file
@@ -29,7 +29,7 @@
     <dl id="home_gps_{{deviceId}}" data-device-id="{{deviceId}}" {{if abnormalStatus=='offline'}}class="offline"{{/if}}>
         <dd title="{{nbbm}}"><a>{{nbbm}}</a></dd>
         <dd></dd>
-        <dd>{{speed}}</dd>
+        <dd>{{speed>99?'..':speed}}</dd>
         <dd>{{expectStopTime}}</dd>
         <dd>
             {{if abnormalStatus != null}}
@@ -34,7 +34,7 @@
                     <span class="field">坐标：</span>{{lon}} {{lat}}
                 </div>
                 <div>
-                    <span class="field">速度：</span>{{speed}}</div>
+                    <span class="field">速度：</span>{{speed>99?'..':speed}}</div>
                 <div>
                     <span class="field">时间：</span>{{dateStr}}</div>
                 {{if expectStopTime!=null}}
@@ -14,6 +14,9 @@ var gb_data_gps = (function () {
             refreshEventCallbacks.push(cb);
     };
+    //超速数据回调
+    //var overspeedEventCallbacks = [];
+
     var refresh = function (cb) {
         $.ajax({
             url: '/gps/real/line',
@@ -43,7 +46,7 @@ var gb_data_gps = (function () {
             upDownChange = [];
         var schArray;
-        $.each(rs, function () {
+        $.each(rs.gpsList, function () {
             old = realData[this.deviceId];
             if (old) {
                 if (this.timestamp > old.timestamp) {
@@ -71,9 +74,12 @@ var gb_data_gps = (function () {
         //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
         //CCCallFuncN
         $.each(refreshEventCallbacks, function (i, cb) {
-            cb(addArr, upArr, upDownChange);
+            cb(addArr, upArr, upDownChange, rs.overspeedList);
         });
+        //超速数据回调
+        //console.log('超速,,,', rs.overspeedList);
+
     };
     var startFixedTime;
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-</head>
-<body>
-    <script src="http://180.168.57.114:4244/Scripts/CallCenterPlugin.js" type="text/javascript"></script>
-</body>
-</html>
 \ No newline at end of file
@@ -4,7 +4,51 @@ var gb_call_phone = function () {
     var wsUri = "ws://180.168.57.114:21892/";
     var nbbm2tel = {
-
+        "S0E-178": "915618938041",
+        "S0E-179": "915618937546",
+        "S0E-182": "915618938047",
+        "S0E-183": "915618937940",
+        "S0E-186": "915601997470",
+        "S0E-187": "915618846405",
+        "S0E-043": "915618847457",
+        "S0E-044": "915618845487",
+        "S2F-070": "915618846479",
+        "S2F-071": "915618820024",
+        "S2F-072": "915618937945",
+        "S2F-073": "915618937845",
+        "S2F-075": "915618847416",
+        "S2F-076": "915618847410",
+        "S2F-077": "915618847413",
+        "S2F-078": "915618847415",
+        "S2F-079": "915618847417",
+        "S2F-080": "915618847418",
+        "S2F-083": "915618847420",
+        "S2F-119": "915618951184",
+        "W0F-018": "915618209534",
+        "W0F-019": "915618951364",
+        "W0F-020": "915618278604",
+        "W0F-021": "915618278614",
+        "W0F-022": "915618012546",
+        "W0F-023": "915618278704",
+        "W0F-024": "915618278594",
+        "W0F-025": "915601989450",
+        "W0F-026": "915618209194",
+        "W0F-027": "915618208724",
+        "W0F-028": "915618278624",
+        "W0F-029": "915601988491",
+        "W0F-030": "915618209324",
+        "W0F-031": "915618928940",
+        "W0F-069": "915618011142",
+        "W0F-070": "915618279534",
+        "W0F-071": "915618847426",
+        "W0F-072": "915618011245",
+        "W0F-073": "915618010242",
+        "W0F-074": "915618279594",
+        "W0F-075": "915618588143",
+        "W0F-089": "915618011747",
+        "W0F-090": "915618279574",
+        "S2F-069": "915618938143",
+        "S2F-081": "915618950034"
     };
     var locData = window.localStorage.getItem('test_nbbm2tel_json');
@@ -13,8 +57,8 @@ var gb_call_phone = function () {
     }
     var login = function (cb) {
-       var agentID = '1002';
-        var dn = '6006';
+        var agentID = '1002';
+        var dn = '6002';
         var options = {
             AgentID: agentID,
@@ -47,14 +91,15 @@ var gb_call_phone = function () {
                 }, 1000);
             }
             else{
-                loginFailed && loginFailed();
+                //loginFailed && loginFailed();
             }
         });
     };
-    
+
     var hangup = function () {
         console.log('hangup...');
         $.CallCenterPublicFun.Hangup();
+        $.CallCenterPublicFun.LoginOff();
     };
     return {
@@ -17,14 +17,14 @@ var gb_signal_state = (function () {
         enable = false;
     var init = function () {
-        $.get('/signalState/multi', {idx: gb_data_basic.line_idx}, function (rs) {
+        /*$.get('/signalState/multi', {idx: gb_data_basic.line_idx}, function (rs) {
             //按班次ID分组
             signal_state_data = gb_common.groupBy(rs, 'schId');
             for (var schId in signal_state_data) {
                 multi_render(signal_state_data[schId]);
             }
-        });
+        });*/
     };
     var multi_render = function (list) {
@@ -28,7 +28,7 @@
                 {{/if}}
             </p>
             <p>设备号：{{deviceId}}</p>
-            <p>速度：{{speed}}</p>
+            <p>速度：{{speed>99?'..':speed}}</p>
             <p>角度：{{direction}}</p>
             <p>经度：{{lon}}</p>
             <p>纬度：{{lat}}</p>
@@ -233,6 +233,10 @@ var gb_map_gps_tree = (function () {
         var deviceId = gb_data_basic.nbbm2deviceMap()[data.value]
             ,gps = gb_data_gps.findOne(deviceId);
+        if(gps.upDown==-1){
+            UIkit.notify(data.value + " 未知上下行！", {pos:'top-center'});
+            return;
+        }
         //展开线路节点
         tree.open_node(tree.get_node('map_tree_line_' + gps.lineId), function () {
             //展开走向节点
@@ -287,6 +291,7 @@ var gb_map_gps_tree = (function () {
         create_node: create_node,
         changeUpDown: changeUpDown,
         update_node: update_node,
-        refresh: refresh
+        refresh: refresh,
+        selectitem: selectitem
     };
 })();
 \ No newline at end of file
@@ -7,7 +7,8 @@ var gb_map_overlay_mge = (function () {
         temps = gb_common.compileTempByDom(dom, {compress: true});
     });
-    var gpsRefresh = function (addArr, upArr, upDownChange) {
+    var $abnormNoticePanel = $('.c_b_abnorm_notice');
+    var gpsRefresh = function (addArr, upArr, upDownChange, overspeedList) {
         if(!$('.main-container .map-panel').is(':visible'))
             return;
         //如果地图正在重绘，暂时不刷新GPS
@@ -16,8 +17,28 @@ var gb_map_overlay_mge = (function () {
         //var all = addArr.concat(upArr).concat(upDownChange);
         gpsRefreshAll(addArr, upArr, upDownChange);
+        //渲染超速信息
+        overspeedList.sort(overspeed_sort);
+        var htmlStr = template('map_abnorm_overspeed_list-temp', {list: overspeedList});
+        $abnormNoticePanel.html(htmlStr).scrollTop($abnormNoticePanel[0].scrollHeight);
     };
+    var overspeed_sort = function (a, b) {
+        if(a.ets && !b.ets)
+            return -1;
+        if(!a.ets && b.ets)
+            return 1;
+        return a.st - b.st;
+    };
+
+    /**
+     * 超速点击
+     */
+    $abnormNoticePanel.on('click', '.c_b_item', function () {
+        var nbbm = $(this).data('nbbm');
+        gb_map_gps_tree.selectitem(null, {value: nbbm});
+    });
+
     var gpsRefreshAll = function (addArr, upArr, upDownChange) {
         //更新设备树菜单
         if(gb_map_gps_tree.readyStatus()){
@@ -87,7 +108,11 @@ var gb_map_overlay_mge = (function () {
         gb_map_imap.call('clearAll');
-        drawAllSection();
+        try{
+            drawAllSection();
+        }catch (e){
+            console.log(e);
+        }
         //重绘GPS
         gb_map_imap.call('drawRealGpsMarker', {gpsList: gb_common.get_vals(gb_data_gps.allGps)});
@@ -53,6 +53,21 @@
     </div>
 </div>
+
+<div class="c_b_abnorm_notice"></div>
+
+<script id="map_abnorm_overspeed_list-temp" type="text/html">
+    {{each list as obj i}}
+    <div class="c_b_item {{obj.ets!=null?'over':''}}" data-nbbm="{{obj.nbbm}}">
+        {{obj.sts}} - {{obj.nbbm}} 开始超速（{{obj.speed}}）
+
+        {{if obj.ets!=null}}
+        <span class="c_b_over"> {{obj.ets}} 结束</span>
+        {{/if}}
+    </div>
+    {{/each}}
+</script>
+
 <script src="/real_control_v2/assets/js/GeoUtils_min.js" merge="map_plugins"></script>
 <script src="/real_control_v2/mapmonitor/js/config.js" merge="map_custom_js"></script>
 <script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="map_custom_js"></script>