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

徐烜
2 parents 4591be1b dea79286
Showing 16 changed files with 505 additions and 121 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/real_control_v2/fragments/north/nav/directive_history.html
src/main/resources/static/real_control_v2/js/home/context_menu.js
 package com.bsth.controller.directive;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.directive.D80;
@@ -17,6 +7,15 @@ import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.directive.DirectiveService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
 /**
  * 
@@ -109,6 +108,20 @@ public class DirectiveController {
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.upDownChange(nbbm, upDown, user.getUserName());
 	}
+
+	/**
+	 *
+	 * @Title: upDownChange
+	 * @Description: TODO(状态切换，营运状态 和 上下行)
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDon
+	 * @throws
+	 */
+	@RequestMapping(value = "/stateChange", method = RequestMethod.POST)
+	public int stateChange(@RequestParam String nbbm, @RequestParam Integer upDown, @RequestParam Integer state){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.stateChange(nbbm, upDown, state, user.getUserName());
+	}
 	/**
 	 * 
@@ -62,6 +62,18 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return list;
 	}
+	
+	@RequestMapping(value = "/saveYlbList",method = RequestMethod.GET)
+	public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = yblService.saveYlbList(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
 	/**
 	 * 拆分油量
 	 * @param map
@@ -69,7 +81,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 */
 	@RequestMapping(value = "/sort",method = RequestMethod.GET)
 	public Map<String, Object> sort(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=yblService.sort(map);
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list=yblService.sort(map);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		return list;
 	}
@@ -97,7 +114,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 */
 	@RequestMapping(value = "/checkYl",method = RequestMethod.GET)
 	public Map<String, Object> checkYl(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=yblService.checkYl(map);
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list=yblService.checkYl(map);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		return list;
 	}
@@ -157,6 +179,23 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	}
+	
+
+	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件分页查询) 
+	 * @param @param map 查询条件
+	 * @param @param page 页码
+	 * @param @param size 每页显示数量
+	 * @throws
+	 */
+	@RequestMapping(value = "/ylbList",method = RequestMethod.GET)
+	public List<Ylb> ylbList(@RequestParam Map<String, Object> map){
+		List<Ylb> ylbList=yblService.listYlb(map);
+        return ylbList;
+	}
+	
 	@RequestMapping(value="/oilListMonth")
 	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date){
 		return yblService.oilListMonth(line, date);
@@ -5,6 +5,10 @@ import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.List;
@@ -68,6 +72,8 @@ public abstract class SignalHandle {
      * }
      */
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
         int updown = Integer.parseInt(sch.getXlDir());
         //gps 切换走向
@@ -78,6 +84,8 @@ public abstract class SignalHandle {
         if (station != null) {
             gps.setStopNo(station.getCode());
         }
+
+        logger.info(fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
     }
     /**
@@ -7,6 +7,7 @@ import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -17,6 +18,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * 进出站动作处理
  * Created by panzhao on 2016/12/27.
@@ -138,6 +142,10 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
+            if(sch.getBcType().equals("out")){
+                //出场时，切换成营运状态
+                directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+            }
             //出站既出场
             outStationAndOutPark(sch);
             logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
@@ -164,6 +172,11 @@ public class InOutStationSignalHandle extends SignalHandle{
                 sendUtils.refreshSch(schPrev);
                 dayOfSchedule.save(schPrev);
+
+                if(schPrev.getBcType().equals("out")){
+                    //出场时，切换成营运状态
+                    directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                }
             }
         }
     }
@@ -204,8 +217,14 @@ public class InOutStationSignalHandle extends SignalHandle{
             sendUtils.sendZdsj(sch, next, doneSum);
             //持久化
             dayOfSchedule.save(sch);
-            //下发调度指令
-            directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            if(next != null){
+                //下发调度指令
+                directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            }
+            else if(sch.getBcType().equals("in")){
+                //终班进场，切换成非营运状态
+                directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+            }
             //准备执行下一个班次
             if (next != null) {
@@ -217,10 +236,59 @@ public class InOutStationSignalHandle extends SignalHandle{
                 transformUpdown(gps, next);
             }
         }
-        else if(sch.getFcsjActual() == null){
-            //有进站，但班次没有实发，向前追溯一下信号
-            scheduleSignalState.signalRetrospect(gps, sch);
+        else {
+            if(sch.getFcsjActual() == null){
+                //有进站，但班次没有实发，向前追溯一下信号
+                scheduleSignalState.signalRetrospect(gps, sch);
+            }
+
+            //如果当前班次是出场，并且进的是下一个班次的终点
+            if(sch.getBcType().equals("out")){
+                ScheduleRealInfo next = dayOfSchedule.next(sch);
+                if(next.getZdzCode().equals(gps.getStopNo())){
+                    List<ScheduleRealInfo> halfList = dayOfSchedule.findByNbbm(sch.getClZbh());
+                    //和当前进站信号最匹配的一个班次
+                    ScheduleRealInfo nearSch = nearScheduleByGpsIn(gps, halfList);
+
+                    if(nearSch != null){
+                        //直接跳到这个班次
+                        dayOfSchedule.addExecPlan(nearSch);
+                        //重新进站
+                        inStation(gps, prev);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 和当前进站信号最匹配的一个班次
+     * @param gps
+     * @param halfList
+     * @return
+     */
+    private ScheduleRealInfo nearScheduleByGpsIn(GpsEntity gps, List<ScheduleRealInfo> halfList){
+        if(halfList == null || halfList.size() == 0)
+            return null;
+
+        //排序
+        Collections.sort(halfList, new ScheduleComparator.FCSJ());
+        ScheduleRealInfo near = null;// = halfList.get(0);
+        ScheduleRealInfo sch;
+
+        String stopId = gps.getStopNo();
+        for(int i = 0; i < halfList.size(); i ++){
+            sch = halfList.get(i);
+            if(!sch.getZdzCode().equals(stopId))
+                continue;
+
+            if(sch.getZdsjT() < gps.getTimestamp())
+                near = sch;
+            else
+                break;
+
         }
+        return near;
     }
     /**
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-003"))
+            /*if(nbbm.equals("SXC-YD012"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
@@ -163,9 +163,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
                     reverseSignalHandle.handle(gps, prevs);
                     //进出站动作处理
                     inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
-                    //Thread.sleep(50);
+                    GeoCacheData.putGps(gps);
                 }
             } catch (Exception e) {
                 logger.error("", e);
@@ -38,7 +38,7 @@ public class Ylb {
 	private String shyy;
 	private Double zlc=0.0;
 	private int yhlx;
-	private String rylx;
+	private String rylx="0";
 	private Double ns=0.0;
 	private Double fyylc=0.0;
 	private Double jhzlc=0.0;
@@ -88,4 +88,26 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and xlbm like %?4% "
 			+ " and nbbm like %?5%",nativeQuery=true)
 	List<Object[]> sumYlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
+
+	@Query(value="select s from Ylb s "
+			+ " where to_days(?1)=to_days(s.rq) "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_ylb SET " +
+				" jzyl = ?2, " +
+				" sh = ?3," +
+				" shyy = ?4," +
+				" ns = ?5," +
+				" rylx = ?6" +
+				" WHERE id = ?1", nativeQuery=true)
+	public void ylbUpdate(Integer id,double jzyl,double sh,String shyy,double ns,String rylx);
 }
@@ -125,7 +125,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
 	//按月统计
@@ -136,7 +136,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	//按照时间段统计
+		@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+		List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
+	
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 package com.bsth.service.directive;
-import java.util.List;
-import java.util.Map;
-
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D80;
@@ -11,6 +8,9 @@ import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
 public interface DirectiveService extends BaseService<D60, Integer>{
 	/**
@@ -93,4 +93,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	int sendC0A5(String json);
     int refreshLineFile(String deviceId);
+
+    int stateChange(String nbbm, Integer upDown, Integer state, String userName);
 }
@@ -504,4 +504,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
 	}
+
+	@Override
+	public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
+		return send60Operation(nbbm, state, upDown, null, userName);
+	}
 }
@@ -8,16 +8,17 @@ import com.bsth.service.BaseService;
 public interface YlbService extends BaseService<Ylb, Integer>{
 	Map<String, Object> obtain(Map<String, Object> map) throws Exception;
+	Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception;
 	String obtainDsq() throws Exception;
-	Map<String, Object> sort(Map<String, Object> map);
+	Map<String, Object> sort(Map<String, Object> map)  throws Exception;
 	Map<String, Object> outAndIn(Map<String, Object> map) throws Exception;
-	Map<String, Object> checkYl(Map<String, Object> map);
+	Map<String, Object> checkYl(Map<String, Object> map)  throws Exception;
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	List<Ylb> oilListMonth(String line,String date);
-	
+	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
 }
@@ -15,6 +15,7 @@ import java.util.Map;
 import javax.transaction.Transactional;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
@@ -173,6 +176,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 						t.setRq(sdf.parse(rq));
 						repository.save(t);
@@ -323,8 +327,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
-					
 					 if(type.equals("add")){
 						 addList.add(t); 
 					 }else{
@@ -381,6 +385,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			nbbm=map.get("nbbm_eq").toString();
 		}
+		List<Cyl> cylListAdd=new ArrayList<Cyl>();
+		Map<String, Object> cylMapAdd=new HashMap<String,Object>();
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		Map<String, Object> map2=new HashMap<String,Object>();
 		try {
@@ -391,7 +397,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 获取车辆存油信息
 			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 指定日期YLB信息
-			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
 			for (int i=0;i<ylbList.size();i++) {
 				Ylb ylb = ylbList.get(i);
@@ -427,31 +433,40 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //					Iterator<Ylb> iterator2 = repository
 //							.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx")).iterator();
 					for (int j = 0; j < iterator2.size(); j++) {
-						
 						Ylb t = iterator2.get(j);
 						if(t.getNbbm().equals(ylb.getNbbm())){
 							if (t.getJcsx() == 1) {
 								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
 								Double yl = t.getCzyl();
 								Double jcyl = t.getCzyl();
-//								zyl = jcyl + jzl - yl;
 								zyl =Arith.sub( Arith.add(jcyl, jzl),yl);
-								Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								t.setYh(yh);
-//								nextJzyl = t.getJzl() + t.getCzyl() - yh;
+								Double yh=0.0;
+								if(zlc>0){
+									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
 								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
-//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-								t.setJzyl(nextJzyl);
+								//把进场油量的小数和整数分别取出
+//								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
+								long l=Math.round(nextJzyl);
+								double ylxs=l*100/100;
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+								t.setYh(yh);
+								t.setJzyl(ylxs);
+								nextJzyl=ylxs;
 							} else {
-//								t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
 								t.setCzyl(nextJzyl);
 								Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								t.setYh(yh);
-//								nextJzyl = t.getJzl() + nextJzyl - yh;
 								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
-//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-								t.setJzyl(nextJzyl);
+								long l=Math.round(nextJzyl);
+								double ylxs=l*100/100;
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+								t.setYh(yh);
+								t.setJzyl(ylxs);
+								nextJzyl= ylxs;
 							}
+						
 							repository.save(t);
 						}
@@ -470,17 +485,36 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						if (fage) {
 							cylRepository.save(cyl);
 						} else {
-							cyl = new Cyl();
-							cyl.setNbbm(t.getNbbm());
-							cyl.setCyl(t.getJzyl());
-							cyl.setGsdm(t.getSsgsdm());
-							cyl.setUpdatetime(t.getRq());
-							cylRepository.save(cyl);
+							if(cylMapAdd.get(t.getNbbm())!=null){
+								for (int l = 0; l < cylListAdd.size(); l++) {
+									cyl=cylListAdd.get(l);
+									if(cyl.getNbbm().equals(t.getNbbm())){
+										cyl.setNbbm(t.getNbbm());
+										cyl.setCyl(t.getJzyl());
+										cyl.setGsdm(t.getSsgsdm());
+										cyl.setFgsdm(t.getFgsdm());
+										cyl.setUpdatetime(t.getRq());
+									}
+								}
+							}else{
+								cyl = new Cyl();
+								cyl.setNbbm(t.getNbbm());
+								cyl.setCyl(t.getJzyl());
+								cyl.setGsdm(t.getSsgsdm());
+								cyl.setFgsdm(t.getFgsdm());
+								cyl.setUpdatetime(t.getRq());
+								cylListAdd.add(cyl);
+							}
+							
+							
 						}
 						map2.put("status", ResponseCode.SUCCESS);
 					}
 				}
 			}
+			for (int i = 0; i < cylListAdd.size(); i++) {
+				cylRepository.save(cylListAdd.get(i));
+			}
 		} catch (Exception e) {
 			map2.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
@@ -494,7 +528,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	 */
 	@Transactional  
 	@Override
-	public Map<String, Object> sort(Map<String, Object> map) {
+	public Map<String, Object> sort(Map<String, Object> map) throws Exception{
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap = new HashMap<String, Object>();
 		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
@@ -507,7 +541,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			Double sh= Double.parseDouble(map.get("sh").toString());
 			String shyy=map.get("shyy").toString();
 			Ylb ylb = repository.findOne(id);
-			
+			List<Cyl> cylListAdd=new ArrayList<Cyl>();
+			Map<String, Object> cylMapAdd=new HashMap<String,Object>();
 			String nbbm_eq = ylb.getNbbm();
 			Date rq_eq = ylb.getRq();
 			// 得到一天总的加油和里程（根据车，时间）
@@ -527,12 +562,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			//新的 损耗不等于 旧的损耗 总损耗从新算
 			if(Arith.sub(ylb.getSh(),sh )!=0){
-//				zsh =zsh-ylb.getSh()+sh;
 				zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
-//				jzl =jzl-zsh;
 				jzl =Arith.sub(jzl, zsh);
 			}else{
-//				jzl=jzl-zsh;
 				jzl =Arith.sub(jzl, zsh);
 			}
 			map.put("nbbm_eq", nbbm_eq);
@@ -555,33 +587,37 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setShyy(shyy);
 					}
 					Double jcyl = t.getCzyl();
-//					zyl = jcyl + jzl - yl;
 					zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
 					Double yh = 0.0;
 					if (zlc > 0 && t.getZlc() > 0) {
 						yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 					}
-					t.setYh(yh);
-//					nextJzyl = t.getJzl() + t.getCzyl() - yh-t.getSh();
 					nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
-//					t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-					t.setJzyl(nextJzyl);
+					long l=Math.round(nextJzyl);
+					double ylxs=l*100/100;
+//					nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+					yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+					t.setJzyl(ylxs);
+					t.setYh(yh);
+					nextJzyl=ylxs;
 				} else {
 					if(t.getId()==id){
 						t.setSh(sh);
 						t.setShyy(shyy);
 					}
-					if (t.getZlc() != 0) {
-//						t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
 						t.setCzyl(nextJzyl);
-						Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-						t.setYh(yh);
-//						nextJzyl = t.getJzl() + nextJzyl - yh-t.getSh();
+						Double yh =0.0;
+						if (t.getZlc() != 0) {
+							yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+						}
 						nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
-//						t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-						t.setJzyl(nextJzyl);
-					}
-
+						long l=Math.round(nextJzyl);
+						double ylxs=l*100/100;
+//						nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+						yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+						t.setJzyl(ylxs);
+						t.setYh(yh);
+						nextJzyl=ylxs;
 				}
 				repository.save(t);
@@ -600,19 +636,37 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				if (fage) {
 					cylRepository.save(cyl);
 				} else {
-					cyl = new Cyl();
-					cyl.setNbbm(t.getNbbm());
-					cyl.setCyl(t.getJzyl());
-					cyl.setGsdm(t.getSsgsdm());
-					cyl.setUpdatetime(t.getRq());
-					cylRepository.save(cyl);
+					if(cylMapAdd.get(t.getNbbm())!=null){
+						for (int l = 0; l < cylListAdd.size(); l++) {
+							cyl=cylListAdd.get(l);
+							if(cyl.getNbbm().equals(t.getNbbm())){
+								cyl.setNbbm(t.getNbbm());
+								cyl.setCyl(t.getJzyl());
+								cyl.setGsdm(t.getSsgsdm());
+								cyl.setFgsdm(t.getFgsdm());
+								cyl.setUpdatetime(t.getRq());
+							}
+						}
+					}else{
+						cyl = new Cyl();
+						cyl.setNbbm(t.getNbbm());
+						cyl.setCyl(t.getJzyl());
+						cyl.setGsdm(t.getSsgsdm());
+						cyl.setFgsdm(t.getFgsdm());
+						cyl.setUpdatetime(t.getRq());
+						cylListAdd.add(cyl);
+					}
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
+			for (int i = 0; i < cylListAdd.size(); i++) {
+				cylRepository.save(cylListAdd.get(i));
+			}
 		} catch (Exception e) {
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
+			throw e; 
 		}
 		return newMap;
 	}
@@ -624,7 +678,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	 */
 	@Transactional
 	@Override
-	public Map<String, Object> checkYl(Map<String, Object> map) {
+	public Map<String, Object> checkYl(Map<String, Object> map) throws Exception{
 		Map<String, Object> newMap=new HashMap<String,Object>();
 //		String xlbm="";
 //		if(map.get("xlbm_like")!=null){
@@ -845,6 +899,97 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //		}
 		return sumMap;
 	}
+
+	@Override
+	public List<Ylb> listYlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Ylb> listYlb=new ArrayList<Ylb>();
+		List<String> stringList=new ArrayList<String>();
+		String rq=map.get("rq").toString();
+		String gsbm=map.get("ssgsdm_like").toString();
+		String fgsbm=map.get("fgsdm_like").toString();
+		String xlbm=map.get("xlbm_like").toString().trim();
+		String nbbm=map.get("nbbm_eq").toString();
+		String sxtj=map.get("sxtj").toString();
+		if(nbbm.trim()!=""){
+			stringList.add(nbbm);
+			listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+		}else{
+			//全部
+			if(sxtj.equals("0")){
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					stringList.add(clbm);
+				}
+				if(stringList.size()>0){
+					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				}
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				if(stringList.size()>0){
+					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				}
+			}
+		}
+
+		return listYlb;
+	}
+	
+	@Transactional  
+	@Override
+	public Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		try{
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		
+		for (int i = 0; i < jsonArray.size(); i++) {
+//			Ylb t=new Ylb();
+			jsonObject=jsonArray.getJSONObject(i);
+			
+			Double jzyl =jsonObject.getDoubleValue("jzyl");
+			Double sh  =jsonObject.getDoubleValue("sh");
+			String shyy =jsonObject.getString("shyy");
+			Double ns = jsonObject.getDoubleValue("ns");
+			String rylx =jsonObject.getString("rylx");
+			Integer id =jsonObject.getInteger("id");
+			/*t.setJzyl(jzyl);
+			t.setSh(sh);
+			t.setShyy(shyy);
+			t.setNs(ns);
+			t.setRylx(rylx);
+			t.setId(jsonObject.getInteger("id"));*/
+			repository.ylbUpdate(id, jzyl, sh, shyy, ns, rylx);
+		}
+//		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
+		
+		newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		return newMap;
+	}
 }
@@ -1300,7 +1300,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
         int jhbc = 0, cjbc = 0, ljbc = 0;
-        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
+        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0,jhlcOrig=0, jcclc = 0;
         float addMileage = 0l, remMileage = 0l,addMileageYy = 0l,addMileageJc =0l;
         Map<String, Object> map = new HashMap<String, Object>();
         for (ScheduleRealInfo scheduleRealInfo : list) {
@@ -1310,6 +1310,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //临加里程（主任务临加），
                 //计划班次，烂班班次，增加班次
                 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                jhlcOrig = scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+                
                 if (scheduleRealInfo.isSflj()) {
                     addMileage += tempJhlc;
                     if (scheduleRealInfo.getBcType().equals("in")
@@ -1324,9 +1326,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     if (!(scheduleRealInfo.getBcType().equals("in")
                             || scheduleRealInfo.getBcType().equals("out"))) {
                     	 jhbc++;
-                         jhlc += tempJhlc;
+                         jhlc += jhlcOrig;
                          if (scheduleRealInfo.getStatus() == -1) {
-                             remMileage += tempJhlc;
+                             remMileage += jhlcOrig;
                              cjbc++;
                          }
                     }
@@ -1373,12 +1375,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
+        
+        //yygl 包含了临加的营运公里  jcclc包含了临加的进出场里程
         map.put("jhlc", format.format(jhlc));
         map.put("remMileage", format.format(remMileage));
         map.put("addMileage", format.format(addMileage));
-        map.put("yygl", format.format(yygl+addMileageYy));
+        map.put("yygl", format.format(yygl));
         map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileageYy));
+        map.put("realMileage", format.format(yygl + ksgl + jcclc));
 //        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
         map.put("jhbc", jhbc);
         map.put("cjbc", cjbc);
@@ -2130,7 +2134,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<Map<String, Object>> statisticsDailyTj(String line, String date,String date2,
                                                      String xlName, String type) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2);
+        if(line!=null){
+        	list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
+        }else{
+        	list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2);
+        }
+            
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         DecimalFormat format = new DecimalFormat("0.00");
@@ -2897,12 +2906,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         //前一天日期
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
-    	  System.out.println("shijian1:"+new Date());
+//    	  System.out.println("shijian1:"+new Date());
         List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm);
-        System.out.println("shijian2:"+new Date());
+//        System.out.println("shijian2:"+new Date());
         //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
-        System.out.println("shijian3:"+new Date());
+//        System.out.println("shijian3:"+new Date());
         for (int x = 0; x < yesterdayDataList.size(); x++) {
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
@@ -2929,18 +2938,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
 	                    if (scheduleRealInfo.isSflj()) {
 	                    	if(scheduleRealInfo.getStatus() == -1){
-//	                    		addMileage += tempJhlc;
 	                    		addMileage =Arith.add(addMileage, tempJhlc);
 	                    	}
 	                    } else {
 	                        if (!(scheduleRealInfo.getBcType().equals("in")
 	                                || scheduleRealInfo.getBcType().equals("out"))) {
-//	                            jhlc += tempJhlc;
 	                            jhlc =Arith.add(jhlc,tempJhlc);
 	                        }
 	                        if (scheduleRealInfo.getStatus() == -1) {
-//	                            remMileage += tempJhlc;
 	                            remMileage =Arith.add(remMileage,tempJhlc);
 	                        }
 	                    }
@@ -2950,7 +2956,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                        if (scheduleRealInfo.getBcType().equals("in") ||
 	                                scheduleRealInfo.getBcType().equals("out")) {
 	                        	if (scheduleRealInfo.getStatus() != -1) {
-//	                        		jcclc += tempJhlc;
 	                        		jcclc=Arith.add(jcclc,tempJhlc);
 	                        	}
 	                        }
@@ -2960,7 +2965,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	//						}
 	                        else {
 	                            if (scheduleRealInfo.getStatus() != -1) {
-//	                                yygl += tempJhlc;
 	                                yygl=Arith.add(yygl,tempJhlc);
 	                            }
 	                        }
@@ -2970,19 +2974,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                            ChildTaskPlan childTaskPlan = it.next();
 	                            if (childTaskPlan.getMileageType().equals("empty")) {
 	                                if (childTaskPlan.isDestroy()) {
-//	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                } else {
-//	                                    ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    ksgl += Arith.add(ksgl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                }
 	                            } else {
 	                                if (childTaskPlan.isDestroy()) {
-//	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                } else {
-//	                                    yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                }
@@ -23,7 +23,10 @@
                     <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 blue" id="saveButton"><i class="fa fa-check-circle"></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">
@@ -187,7 +190,7 @@
     {{each list as obj i}}
     <tr>
         <td style="vertical-align: middle;">
-            <input type="radio" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
+            <input type="checkbox" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
         </td>
         <td>
@@ -212,18 +215,23 @@
             {{obj.czyl}}
         </td>
         <td>
-            <a data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzyl">
-                {{obj.jzyl}}
-            </a>
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzyl" 
+type="text" value=" {{obj.jzyl}}" style=" width:40px"  onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
+onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
         </td>
         <td>
             {{obj.yh}}
         </td>
         <td>
-            {{obj.rylx}}
+			<select data-id="{{obj.id}}" class="in_carpark_rylx">
+				<option value='0' {{if obj.rylx==0}}  selected = 'selected' {{/if}}>0号柴油</option> 
+				<option value='1' {{if obj.rylx==1}}  selected = 'selected' {{/if}}>负10号柴油</option> 
+			</select>
         </td>
         <td>
-            {{obj.ns}}
+			<input data-id="{{obj.id}}" href="javascript:;" 
+class="in_carpark_ns" type="text" value=" {{obj.ns}}" style=" width:40px"  onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
+onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
         </td>
         <td>
 			<select data-id="{{obj.id}}" class="in_carpark_shyy">
@@ -239,9 +247,9 @@
 			</select>
         </td>
         <td>
-			<a data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl">
-            	{{obj.sh}}
-			</a>
+		<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl" type="text" 
+value=" {{obj.sh}}" style=" width:40px" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
+onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')" >
         </td>
         <td>
             {{obj.zlc}}
@@ -294,7 +302,49 @@
                 layer.msg('请选择日期.');
             }
         });
-     
+       
+        
+        //保存
+        $("#saveButton").on('click',function(){
+        	var ylArray = [];
+        	/* $('input.icheck:checked').each(function(){
+        		var map = {};
+        		var id=$(this).data('id');
+        		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
+        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').html();
+                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+                map['id']=id;
+                map['jzyl']=jzyl;
+                map['sh']=sh;
+                map['shyy']=shyy;
+                ylArray.push(map);
+        	}) */
+        	
+        	$('input.icheck').each(function(){
+        		var map = {};
+        		var id=$(this).data('id');
+        		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+                var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+                var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+                map['id']=id;
+                map['jzyl']=jzyl;
+                map['sh']=sh;
+                map['shyy']=shyy;
+                map['ns']=ns;
+                map['rylx']=rylx;
+                ylArray.push(map);
+        	})
+        	var params = {};
+        	params['ylbList']=JSON.stringify(ylArray);
+        	 var i = layer.load(2);
+        	 $get('/ylb/saveYlbList', params, function () {
+             	layer.close(i);
+             	var params1 =getParamsList();
+                 jsDoQuery(params1, true);
+             }); 
+        })
         //拆分
         $("#sortButton").on('click', function () {
             if ($("#rq").val() != "") {
@@ -348,7 +398,7 @@
         var page = 0, initPagination;
         var icheckOptions = {
-            radioClass: 'iradio_square-blue icheck',
+            radioClass: 'icheckbox_flat-blue',
             increaseArea: '20%'
         }
@@ -473,31 +523,29 @@
     		} */
             var l = layer.load(2);
-            $get('/ylb', params, function (data) {
+            $get('/ylb/ylbList', params, function (data) {
-                $.each(data.content, function (i, obj) {
+                $.each(data, function (i, obj) {
                     obj.rq = moment(obj.rq).format("YYYY-MM-DD");
                 });
-                var bodyHtm = template('ylb_list_temp', {list: data.content});
-				
-                $('#datatable_ylb tbody').html(bodyHtm)
+                var bodyHtm = template('ylb_list_temp', {list:data});
+                $('#datatable_ylb tbody').html(bodyHtm);
+               /*  $('#datatable_ylb tbody').html(bodyHtm)
                         .find('.icheck').iCheck(icheckOptions)
                         .on('ifChanged', iCheckChange);
                 if (pagination && data.content.length > 0) {
                     //重新分页
                     initPagination = true;
                     showPagination(data);
-                }
+                } */
                 layer.close(l);
             	$get('/ylb/sumYlb',params,function(returns){
-            		console.log(returns);
-            		console.log(returns.jzl);
             		$("#sumJzl").html(returns.jzl);
             		$("#sumYh").html(returns.yh);
             		$("#sumSh").html(returns.sh);
         		});
-                startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
-                startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
+//                 startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
+//                 startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
             });
         }
@@ -65,9 +65,9 @@
                   {{if obj.reply46 != 0}}
                   <div class="uk-badge uk-badge-danger"> 设备未响应</div>
                   {{else if obj.reply47 != 0}}
-                  <div class="uk-badge uk-badge-warning"> 驾驶员未确认</div>
+                  <div class="uk-badge uk-badge-warning"> 设备已响应</div>
                   {{else if obj.reply46 == 0 && obj.reply47 == 0}}
-                  <div class="uk-badge"> 成功</div>
+                  <div class="uk-badge"> 驾驶员已确认</div>
                   {{/if}}
                 {{/if}}
             </td>
@@ -39,6 +39,20 @@ var gb_home_context_menu = (function() {
         });
     };
+    //营运状态和上下行切换
+    var stateChange = function (nbbm, updown, state) {
+        $.post('/directive/stateChange', {
+            nbbm: nbbm,
+            upDown: updown,
+            state: state
+        }, function(rs) {
+            if (rs == 0)
+                notify_succ('指令已发出');
+            else
+                notify_err('发送失败，原因参考【指令下发记录】');
+        });
+    };
+
     // send phrase
     var sendPhrase = function() {
         var dom = temps['home-send-phrase-temp']({
@@ -139,11 +153,19 @@ var gb_home_context_menu = (function() {
     };
     var state_up_0 = function() {
-        changeUpDown(active_car, 0);
+        stateChange(active_car, 0, 0);
     };
     var state_down_0 = function() {
-        changeUpDown(active_car, 1);
+        stateChange(active_car, 1, 0);
+    };
+
+    var state_up_1 = function () {
+        stateChange(active_car, 0, 1);
+    };
+
+    var state_down_1 = function () {
+        stateChange(active_car, 1, 1);
     };
     var line_change = function() {
@@ -179,7 +201,6 @@ var gb_home_context_menu = (function() {
         });
     };
-
     var C0_A3 = function(){
       open_modal('/real_control_v2/fragments/home/c0_a3.html', {}, {center: false, bgclose: false});
     };
@@ -190,7 +211,9 @@ var gb_home_context_menu = (function() {
         state_up_0: state_up_0,
         state_down_0: state_down_0,
         line_change: line_change,
-        C0_A3: C0_A3
+        C0_A3: C0_A3,
+        state_up_1: state_up_1,
+        state_down_1: state_down_1
     };
     $.contextMenu({
@@ -210,6 +233,13 @@ var gb_home_context_menu = (function() {
             'fold_state': {
                 name: '状态切换',
                 items: {
+                    'state_up_1': {
+                        'name': '上行非营运'
+                    },
+                    'state_down_1': {
+                        'name': '下行非营运'
+                    },
+                    'sep3_2': '---------',
                     'state_up_0': {
                         'name': '上行营运'
                     },