路单调整、禁发出场班次、指令重发功能

ljq
1 parent 84308faa
Showing 15 changed files with 411 additions and 54 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/ZnddThread.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/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/CulateMileageService.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/mould/waybill_minhang_dl.xls
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
src/main/resources/static/real_control_v2/zndd/type/sftz_1.html
src/main/resources/static/real_control_v2/zndd/zndd.html
@@ -154,7 +154,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/**
 	 *
 	 * @Title: realOutAdjust
-	 * @Description: TODO(实发调整)智能调度
+	 * @Description: TODO(实发未发)智能调度
 	 * @param @param id 班次ID
 	 * @param @param fcsjActual 实际发车时间 HH:mm
 	 * @param @param remarks 备注
@@ -93,7 +93,7 @@ public class PilotReport {
                         if (outSch.getJhlc() == null)
                             outSch = dayOfSchedule.next(outSch);
                         //下发调度指令
-                        DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统", "同意出场;");
+                        //DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统", "同意出场;");
                     }
                     break;
             }
@@ -15,7 +15,9 @@ import com.bsth.entity.StationRoute;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.StationRouteRepository;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.HttpClientUtils;
@@ -62,7 +64,7 @@ public class AutomaticSch {
     private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
     SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-    private Map<String,String> drivreMap =new HashMap<>(); //自动重发map
+    private Map<String,Long> drivreMap =new HashMap<>(); //自动重发map
     // 当日60指令缓存
     private   ConcurrentMap<Integer, D60> d60Map = new ConcurrentHashMap<>();//d60map
@@ -118,14 +120,14 @@ public class AutomaticSch {
     }
-    //实发调整检测 -- 车辆GPS掉线的情况下，车辆该出站了
+    //实发未发检测 -- 车辆GPS掉线的情况下，车辆该出站了
     /**
      * 1。已过待发时间还没发车的
      * 2.设备离线
      * --上一班次还没有抵达终点不做操作
      */
     public void sftz(){
-        logger.warn("实发调整扫描开始");
+        logger.warn("实发未发扫描开始");
         try {
             //获取所有线路
             Map<String, String> lineMap =  BasicData.lineCode2NameMap;
@@ -136,7 +138,7 @@ public class AutomaticSch {
                     //1.离线 2.实发时间为空 3.已过待发时间还没发车的
                     long time = System.currentTimeMillis();//实际时间+2分钟
                     //超过待发时间  实发时间还是null的
-                    if (sr.getFcsjT() + (1000*2) < time) {
+                    if (sr.getFcsjT() + (1000*3) < time) {
                         //起点站实际到达时间为null的情况下
                         if (StringUtils.isEmpty(sr.getQdzArrDatesj())) {
@@ -167,9 +169,9 @@ public class AutomaticSch {
             }
         }catch (Exception e){
-            logger.error("自动调度，实发调整推送失败---",e);
+            logger.error("自动调度，实发未发推送失败---",e);
         }
-        logger.warn("实发调整扫描结束");
+        logger.warn("实发未发扫描结束");
     }
     //实发撤销检测 -- 出现快一慢三的情况  && 指令重发
@@ -239,7 +241,7 @@ public class AutomaticSch {
     }
     /**
-     * 指令重发
+     * 指令重发 -- 芦潮港1路
      * 指令下发后设备未响应后  5分钟后重新发送一次 还未响应的话 未来一小时不自动发送该设备
      */
     public void drivresponse(){
@@ -254,18 +256,38 @@ public class AutomaticSch {
             String lineCode;
             for (Map.Entry<String, String> ts : lineMap.entrySet()) {
                 lineCode = ts.getKey();
+                if (!lineCode.equals("12101"))
+                    return;
+                
                 oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
                 for (ScheduleRealInfo t : oldSchDateList){
                     //指令重发
-                    //1.待发时间是要超过当前时间的，2.当实际发车时间不为空的
-                    //3.状态 驾驶员未响应的
-                    if(t.getFcsjT() < new Date().getTime() && t.getFcsjActual() != null){
-
+                    //1.班次已经执行过的
+                    //2.驾驶员未确认的
+                    //3.
+                    Long t1 = 1000L * 60 * 5;
+                    Long sj = new Date().getTime();
+                    if(t.getStatus()  == 2 && t.getDirectiveState() != 200 && t.getBcType().equals("normal")){
+                        //还未下发的
+                        if (drivreMap.get(t.getClZbh()) == null){
+                            //下发或者处置
+                            drivreMap.put(t.getClZbh(),new Date().getTime());
+                            directiveService.send60DispatchZndd(t.getId(), "智能调度");
+                   
+                        //下发实际超过5分钟的
+                        } else if (drivreMap.get(t.getClZbh()) + t1 <= sj){
+                            directiveService.send60DispatchZndd(t.getId(), "智能调度");
+                            //更新下发时间
+                            drivreMap.put(t.getClZbh(),new Date().getTime());
+                        //下发时间未超过5分钟返回
+                        }
                     }
-                    
-                    
                 }
             }
+            
+            
+            
+            
         }catch (Exception e){
             logger.error("自动调度，指令重发---",e);
         }
@@ -65,18 +65,21 @@ public class ZnddThread extends Thread{
             //DKL(); //大客流 以接口方式
             //automaticSch.mz();
             //automaticSch.dfTz();//大间隔
-            //automaticSch.drivresponse(); //设备重发
             for (znddStatus zs : znddStatusList) {
                 if (zs.getOpenStatus().equals("0")) {
                     if (zs.getType().equals("sftz")) {
-                        automaticSch.sftz();//实发调整
+                        automaticSch.sftz();//实发未发
                         logger.info("实发执行完毕");
                     }
                     if (zs.getType().equals("ycsf")) {
                         automaticSch.sfCX();// 异常实发 - 实发撤销
                         logger.info("异常实发执行完毕");
                     }
+                    if (zs.getType().equals("zlcf")){
+                        automaticSch.drivresponse();
+                        logger.info("设备重发执行完毕");
+                    }
                 }
             }
         }catch (Exception e){
@@ -43,6 +43,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 */
 	int send60Dispatch(Long id, String sender);
+	int send60DispatchZndd(Long id, String sender);
 	//60营运指令
 	int send60Operation(String nbbm, int state, int upDown, String sender);
@@ -179,6 +179,81 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         return code;
     }
+    
+    public int send60DispatchZndd(ScheduleRealInfo sch, int finish, String sender, String txtPrefix) {
+        D60 d60 = null;
+        try {
+            if (sch.isDestroy()) {
+                logger.warn("烂班不允许发送调度指令....");
+                return -1;
+            }
+
+            //待发应到时间
+            String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+            String text = "(自动补发命令)"+sch.getFcsjActual() +"发出的,由"
+                    + sch.getQdzName() + "发往" + sch.getZdzName() + ";还未确认,请尽快确认";
+
+            if(sch.getBcType().equals("venting")){
+                text += " (直放)";
+            }
+            else if(sch.getBcType().equals("major")){
+                text += " (放站到"+sch.getMajorStationName()+"带客)";
+            } else if ("ldks".equals(sch.getBcType())) {
+                text += " (两点空驶)";
+            }
+
+            //下发0x02指令  调度指令(闹钟有效)
+            long t = System.currentTimeMillis() + 1000 * 30,
+                    alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
+
+            if(StringUtils.isNotEmpty(txtPrefix)){
+                text = txtPrefix + text;
+            }
+            text = StringEscapeUtils.unescapeHtml4(text);
+            int state = 0;//营运状态
+            if(dayOfSchedule.emptyService(sch))
+                state = 1;
+            d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+                    , state, new Date(alarmTime));
+
+            d60.setLineCode(sch.getXlBm());
+        } catch (Exception e) {
+            logger.error("生成调度指令时出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        d60.setSender(sender);
+
+        JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
+
+        //进场或者出场班次时，附加lock 标识
+        if (null != sch.getBcType()
+                && (sch.getBcType().equals("out") || sch.getBcType().equals("in"))) {
+
+            jObj.put("lock", 1);
+        }
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(jObj.toJSONString());
+
+        d60.setDispatch(true);
+        d60.setSch(sch);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            sch.setDirectiveState(60);
+            // 通知页面
+            sendD60ToPage(sch);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+        }
+        dayOfDirectives.put60(d60);
+        return code;
+    }
+
     /**
      * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
      */
@@ -204,7 +279,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         int finish = dayOfSchedule.doneSum(sch.getClZbh());
         return send60Dispatch(sch, finish, sender, "");
     }
-
+    
+    @Override
+    public int send60DispatchZndd(Long id, String sender) {
+        ScheduleRealInfo sch = dayOfSchedule.get(id);
+        // 车辆已完成班次
+        int finish = dayOfSchedule.doneSum(sch.getClZbh());
+        return send60DispatchZndd(sch, finish, sender, "");
+    }
+    
     @Override
     public int send60Operation(String nbbm, int state, int upDown, String sender) {
         logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
@@ -2864,14 +2864,20 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("jhlc",Arith.add(culateService.culateJhgl(scheduleRealInfos),culateService.culateJhJccgl(scheduleRealInfos)));
 		        Map.put("remMileage",culateService.culateLbgl(scheduleRealInfos));
 		        Map.put("addMileage", culateService.culateLjgl(lists));
+				Map<String,Double> remmap = culateService.culateLbgl_yy_ks(lists);
+				map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
+				map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
+				Map<String,Double> ljmap = culateService.culateLjgl_yy_ks(lists);
+				map.put("addMileage_yy", ljmap.get("addMileage_yy")); //临加烂班公里
+				map.put("addMileage_ks", ljmap.get("addMileage_ks")); //临加烂班公里
 		        double yygl=Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists));
 		        Map.put("yygl", yygl);
 		        double ksgl=Arith.add(culateService.culateKsgl(scheduleRealInfos),culateService.culateJccgl(lists));
 		        Map.put("ksgl",ksgl);
 		        Map.put("realMileage", Arith.add(yygl ,ksgl));
 		        Map.put("jhbc", culateService.culateJhbc(scheduleRealInfos,""));
-		        Map.put("cjbc", culateService.culateLbbc(scheduleRealInfos));
-		        Map.put("ljbc", culateService.culateLjbc(lists, ""));
+		        Map.put("cjbc", culateService.culateLbbc_yy_ks(scheduleRealInfos));
+		        Map.put("ljbc", culateService.culateLjbc_yy_ks(lists, ""));
 		        int sjbc =culateService.culateLjbc(lists, "")+culateService.culateSjbc(lists, "");
 		        Map.put("sjbc", sjbc);
@@ -1129,14 +1129,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos), culateMieageService.culateJhJccgl(scheduleRealInfos)));
         map.put("remMileage", culateMieageService.culateLbgl(scheduleRealInfos));
         map.put("addMileage", culateMieageService.culateLjgl(lists));
+        Map<String,Double> remmap = culateService.culateLbgl_yy_ks(lists);
+        map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
+        map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
+        Map<String,Double> ljmap = culateService.culateLjgl_yy_ks(lists);
+        map.put("addMileage_yy", ljmap.get("addMileage_yy")); //临加烂班公里
+        map.put("addMileage_ks", ljmap.get("addMileage_ks")); //临加烂班公里
+        
         double yygl = Arith.add(culateMieageService.culateSjgl(lists), culateMieageService.culateLjgl(lists));
         map.put("yygl", yygl);
         double ksgl = Arith.add(culateMieageService.culateKsgl(scheduleRealInfos), culateMieageService.culateJccgl(lists));
         map.put("ksgl", ksgl);
         map.put("realMileage", Arith.add(yygl, ksgl));
         map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos, ""));
-        map.put("cjbc", culateMieageService.culateLbbc(scheduleRealInfos));
-        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        map.put("cjbc", culateMieageService.culateLbbc_yy_ks(scheduleRealInfos));
+        map.put("ljbc", culateMieageService.culateLjbc_yy_ks(lists, ""));
         int sjbc = culateMieageService.culateLjbc(lists, "") + culateMieageService.culateSjbc(lists, "");
         map.put("sjbc", sjbc);
 //      map=new HashMap<String,Object>();
@@ -2226,11 +2233,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhbc", culateService.culateJhbc(list, ""));//计划班次
         map.put("jhlc", Arith.add(culateService.culateJhgl(list),
                 culateService.culateJhJccgl(list))); //计划总里程
-        map.put("cjbc", culateService.culateLbbc(list));//烂班班次
+        map.put("cjbc", culateService.culateLbbc_yy_ks(list));//烂班班次
         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
-        map.put("ljbc", culateService.culateLjbc(lists, ""));//临加班次
+        Map<String,Double> remmap = culateService.culateLbgl_yy_ks(list);
+        map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
+        map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
+
+
+        map.put("ljbc", culateService.culateLjbc_yy_ks(lists, ""));//临加班次
         double ljgl = culateService.culateLjgl(lists);
         map.put("addMileage", ljgl); //临加公里
+        Map<String,Double> ljmap = culateService.culateLjgl_yy_ks(list);
+        map.put("addMileage_yy", ljmap.get("addMileage_yy")); //临加烂班公里
+        map.put("addMileage_ks", ljmap.get("addMileage_ks")); //临加烂班公里
+        
         map.put("sjbc", culateService.culateSjbc(lists, "") + culateService.culateLjbc(lists, ""));
         double ksgl = culateService.culateKsgl(list);//子任务空驶公里
         double jccgl = culateService.culateJccgl(lists);//空驶班次公里
@@ -10,15 +10,18 @@ public interface CulateMileageService {
 	 List<Map<String,Object>> jobFwqk(List<ScheduleRealInfo> lists);
 	 double culateLbgl(List<ScheduleRealInfo> lists);
+
+	Map<String,Double> culateLbgl_yy_ks(List<ScheduleRealInfo> lists);
 	 int culateLbbc(List<ScheduleRealInfo> lists);
-	 
+	 int culateLbbc_yy_ks(List<ScheduleRealInfo> lists);
 	 List<Map<String,Object>> jobLjqk(List<ScheduleRealInfo> lists);
 	 double culateLjksgl(List<ScheduleRealInfo> lists);
 	 double culateLjgl(List<ScheduleRealInfo> lists);
+	 Map<String,Double> culateLjgl_yy_ks(List<ScheduleRealInfo> lists);
 	 double culateLjgl_(List<ScheduleRealInfo> lists,String item);
 	 double culateLjgl_spy(List<ScheduleRealInfo> lists);
 	 int culateLjbc(List<ScheduleRealInfo> lists,String item);
-	 
+	 int culateLjbc_yy_ks(List<ScheduleRealInfo> lists,String item);
 	 double culateJhgl(List<ScheduleRealInfo> lists);
 	 double culateJhgl_(List<ScheduleRealInfo> lists,String item);
@@ -211,6 +211,64 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		return zlblc;
 	}
+
+	@Override
+	public Map<String,Double> culateLbgl_yy_ks(List<ScheduleRealInfo> lists) {
+		Map<String,Double> remMileageMap = new HashMap<>();
+		Double remMileage_yy = 0.0,remMileage_ks = 0.0;
+		// TODO Auto-generated method stub
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			/*if (!isInOut(scheduleRealInfo)) {*/
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(scheduleRealInfo.isDestroy()){
+						if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+								|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+							remMileage_ks  = Arith.add(remMileage_ks,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+						}else {
+							remMileage_yy = Arith.add(remMileage_yy,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+						}
+					}else{
+						double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+						double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+						double cjlc=Arith.sub(jhlcOrig,jhlc);
+						if(cjlc>0){
+							if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+									|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+								remMileage_ks =Arith.add(remMileage_ks, cjlc);
+							}else {
+								remMileage_yy=Arith.add(remMileage_yy, cjlc);
+							}
+						}
+					}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while (it.hasNext()) {
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getCcId()==null){
+							if(childTaskPlan.getMileageType().equals("service")){
+								if (childTaskPlan.isDestroy()) {
+									if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+											|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+										remMileage_ks  = Arith.add(remMileage_ks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+									}else {
+										remMileage_yy = Arith.add(remMileage_yy,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+									}
+								}
+							}
+						}
+					}
+				}
+			
+		}
+		
+		remMileageMap.put("remMileage_yy",remMileage_yy);
+		remMileageMap.put("remMileage_ks",remMileage_ks);
+		return remMileageMap;
+	}
+
+
 	@Override
 	public int culateLbbc(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
@@ -248,6 +306,43 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	}
 	@Override
+	public int culateLbbc_yy_ks(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		int lbbc=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			/*if (!isInOut(scheduleRealInfo)) {*/
+			if(!scheduleRealInfo.isCcService()){
+				if(scheduleRealInfo.getStatus() == -1){
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					boolean b = false;
+					if(!childTaskPlans.isEmpty()){	//（20231031）烂班班次，子任务如果有营运里程，视为实际班次。
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while (it.hasNext()) {
+							ChildTaskPlan c = it.next();
+							if("service".equals(c.getMileageType()) && !c.isDestroy()){
+								BigDecimal mileage = new BigDecimal(c.getMileage());
+								if(mileage.compareTo(BigDecimal.ZERO) == 1){	//大于0
+									b = true;
+								}
+							}
+							if(b){
+								break;
+							}
+						}
+					}
+					if(!b){
+						lbbc++;
+					}
+				}
+			}
+
+		}
+		return lbbc;
+	}
+
+
+	@Override
 	public List<Map<String, Object>> jobLjqk(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
@@ -437,6 +532,87 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		return ljgl;
 	}
+
+
+	@Override
+	public Map<String,Double> culateLjgl_yy_ks(List<ScheduleRealInfo> lists){
+		Map<String,Double> raddMileageMap = new HashMap<>();
+		Double addMileage_yy = 0.0,addMileage_ks = 0.0;
+		// TODO Auto-generated method stub
+		double ljgl=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			/*if (!isInOut(scheduleRealInfo)) {*/
+			if(!scheduleRealInfo.isDestroy()){
+				if(scheduleRealInfo.isSflj()){
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+								|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+							addMileage_ks=Arith.add(addMileage_ks,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+						}else {
+							addMileage_yy=Arith.add(addMileage_yy,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while (it.hasNext()) {
+							ChildTaskPlan childTaskPlan = it.next();
+							if(childTaskPlan.getMileageType().equals("service") && childTaskPlan.getCcId()==null){
+								if (!childTaskPlan.isDestroy()) {
+									Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+									if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+											|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+										addMileage_ks=Arith.add(addMileage_ks,jhgl);
+									}else {
+										addMileage_yy=Arith.add(addMileage_yy,jhgl);
+									}
+								}
+							}
+						}
+					}
+				}else{
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+						double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+						double zjlc=Arith.sub(jhlc, jhlcOrig);
+						if(zjlc>0){
+							if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+									|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+								addMileage_ks=Arith.add(addMileage_ks,ljgl);
+							}else {
+								addMileage_yy=Arith.add(addMileage_yy,ljgl);
+							}
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while (it.hasNext()) {
+							ChildTaskPlan childTaskPlan = it.next();
+							if(childTaskPlan.getCcId()==null){
+								if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+									if (!childTaskPlan.isDestroy()) {
+										Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+										if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+												|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+											addMileage_ks=Arith.add(addMileage_ks,jhgl);
+										}else {
+											addMileage_yy=Arith.add(addMileage_yy,jhgl);
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+				
+		}
+
+		raddMileageMap.put("addMileage_yy",addMileage_yy);
+		raddMileageMap.put("addMileage_ks",addMileage_ks);
+		return raddMileageMap;
+		
+	}
 	@Override
 	public int culateLjbc(List<ScheduleRealInfo> lists,String item) {
 		// TODO Auto-generated method stub
@@ -479,6 +655,48 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	}
 	@Override
+	public int culateLjbc_yy_ks(List<ScheduleRealInfo> lists,String item) {
+		// TODO Auto-generated method stub
+		int ljbc=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			/*if (!isInOut(scheduleRealInfo)) {*/
+			if(scheduleRealInfo.isSflj()){
+				if(item.equals("zgf") || item.equals("wgf")){
+					String time="";
+					if(scheduleRealInfo.getFcsjActual()!=null){
+						time=scheduleRealInfo.getFcsjActual();
+					}
+					if(time.equals("")){
+						if(scheduleRealInfo.getDfsj()!=null){
+							time=scheduleRealInfo.getDfsj();
+						}
+					}
+					if(!time.equals("")){
+						String[] fcsjStr = time.split(":");
+						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+
+						if(item.equals("zgf")){
+							if(fcsj>=zgf1 && fcsj<=zgf2){
+								ljbc++;
+							}
+						}else if(item.equals("wgf")){
+							if(fcsj>=wgf1 && fcsj<=wgf2){
+								ljbc++;
+							}
+						}
+					}
+				}else{
+					ljbc++;
+				}
+			}
+
+		}
+		return ljbc;
+	}
+
+
+	@Override
 	public double culateJhgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		double jhgl=0;
@@ -580,27 +580,32 @@
 		<td>{{jhlc}}</td>
 		<td colspan="3">烂班班次</td>
 		<td colspan="2">{{cjbc}}</td>
-		<td colspan="3"> 烂班公里</td>
-		<td colspan="2">{{remMileage}}</td>
+		<td colspan="3"> 烂班营运公里</td>
+		<td colspan="2">{{remMileage_yy}}</td>
+
+
 	</tr>
 	<tr>
-		<td colspan="2">临加班次</td>
+		<td colspan="2">烂班空驶公里</td>
+		<td>{{remMileage_ks}}</td>
+		<td colspan="1">临加班次</td>
 		<td>{{ljbc}}</td>
-		<td colspan="1">临加公里</td>
-		<td>{{addMileage}}</td>
-		<td colspan="3">实际班次</td>
-		<td colspan="2">{{sjbc}}</td>
-		<td colspan="3">营运公里</td>
-		<td colspan="2">{{yygl}}</td>
+		<td colspan="3">临加营运公里</td>
+		<td colspan="2">{{addMileage_yy}}</td>
+		<td colspan="3">临加空驶公里</td>
+		<td colspan="2">{{addMileage_ks}}</td>
+		
+
+	
 	</tr>
 	<tr>
-		<td colspan="2">空驶公里</td>
-		<td>{{zkslc}}</td>
-		<td colspan="1">总公里</td>
-		<td>{{realMileage}}</td>
-		<td colspan="3"></td>
-		<td colspan="2"></td>
-		<td colspan="3"></td>
-		<td colspan="2"></td>
+		<td colspan="2">实际班次</td>
+		<td >{{sjbc}}</td>
+		<td colspan="1">营运公里</td>
+		<td >{{yygl}}</td>
+		<td colspan="3">空驶公里</td>
+		<td colspan="2">{{zkslc}}</td>
+		<td colspan="3">总公里</td>
+		<td colspan="2">{{realMileage}}</td>
 	</tr>
 </script>
@@ -113,12 +113,12 @@ var gb_dataZndd = (function (){
         alt_confirm(content, function () {
             gb_common.$post('/realSchedule/realOutAdjust_zndd', {
                 id: that.data('id'),
-                remarks:'自动调度实发调整-车辆掉线',
+                remarks:'自动调度实发未发-车辆掉线',
                 fcsjActual:that.data('fcsj')
             }, function (rs) {
                 gb_schedule_table.updateSchedule(rs.ts);
-                notify_succ('实发调整操作成功！');
+                notify_succ('实发未发操作成功！');
                 //calc 应发未发
                 that.parent().parent().remove();
             });
@@ -284,11 +284,11 @@ var gb_dataZndd = (function (){
             debugger
             gb_common.$post('/realSchedule/realOutAdjust_zndd', {
                 id: sch.sch.id,
-                remarks:'自动调度实发调整-车辆掉线',
+                remarks:'自动调度实发未发-车辆掉线',
                 fcsjActual: sch.sch.dfsj,
             }, function (rs) {
                 gb_schedule_table.updateSchedule(rs.ts);
-                notify_succ('实发调整操作成功！');
+                notify_succ('实发未发操作成功！');
             });
@@ -2,7 +2,7 @@
     <div class="uk-modal-dialog" style="width: 850px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>实发调整<i class="uk-icon-question-circle uk-icon-hover"></i></h2></div>
+            <h2>实发未发<i class="uk-icon-question-circle uk-icon-hover"></i></h2></div>
         <form class="uk-form uk-form-horizontal"> </form>
     </div>
@@ -40,11 +40,11 @@
                     gb_common.$post('/realSchedule/realOutAdjust_zndd', {
                         id: sch.sch.id,
-                        remarks:"_自动调度实发调整-车辆掉线",
+                        remarks:"_自动调度实发未发-车辆掉线",
                         fcsjActual:data.fcsjActual,
                     }, function (rs) {
                         gb_schedule_table.updateSchedule(rs.ts);
-                        notify_succ('实发调整操作成功！');
+                        notify_succ('实发未发操作成功！');
                         //calc 应发未发
                         gb_schedule_table.calc_yfwf_num(sch.xlBm);
@@ -150,7 +150,7 @@
     <div class="uk-grid">
         <div class="uk-width-4-2">
             <div class="uk-form-row">
-                <h3>实发调整信息</h3>
+                <h3>实发未发信息</h3>
             </div>
         </div>
     </div>
@@ -209,7 +209,7 @@
             <div class="uk-form-row">
                 <label class="uk-form-label">待发时间</label>
                 <div class="uk-form-controls">
-                    <input  value="{{sch.fcsj}}"  disabled>
+                    <input  value="{{sch.dfsj}}"  disabled>
                 </div>
             </div>
         </div>
@@ -217,7 +217,7 @@
             <div class="uk-form-row">
                 <label class="uk-form-label">待发时间</label>
                 <div class="uk-form-controls">
-                    <input  value="{{sch.fcsj}}" disabled>
+                    <input  value="{{sch.dfsj}}" disabled>
                 </div>
             </div>
         </div>
@@ -17,7 +17,7 @@
                     </li>
                     <li>
                         <input id="s3"  name="s1" value="SFTZ"   type="checkbox" class="switch">
-                        <label for="s3">实发调整</label>
+                        <label for="s3">实发未发</label>
                     </li>
                     <li>
                         <input id="s4" name="s1"  value="WD"  type="checkbox" class="switch">