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

徐烜
2 parents 994786bf aa134516
Showing 16 changed files with 487 additions and 489 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/gpsdata/thread/ThreadPollMonitor.java
src/main/java/com/bsth/entity/directive/D60.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/forms/mould/changetochange.xls
src/main/resources/static/pages/mforms/changetochanges/changetochange.html
src/main/resources/static/real_control_v2/fragments/north/nav/directive_history.html
@@ -303,12 +303,10 @@ public class ExportController {
 			m.put("fssj", l.getFssj());
 			m.put("xgsj", l.getXgsj());
 			m.put("pcch", l.getPcch());
-			m.put("pcry", l.getPcry());
-			m.put("jhch", l.getJhch());
-			m.put("jhgh", l.getJhgh());
 			m.put("sjch", l.getSjch());
+			m.put("fcgh", l.getPcry());
 			m.put("sjgh", l.getSjgh());
-			m.put("yy", l.getYy());
+			m.put("yy", l.getYy()==null?"":l.getYy());
 			m.put("xgr", l.getXgr());
 			resList.add(m);
 		}
@@ -66,7 +66,7 @@ public class MCY_FormsController {
 	}
 	// 换人换车情况统计表
-	@RequestMapping(value = "/changetochange", method = RequestMethod.POST)
+	@RequestMapping(value = "/changetochange", method = RequestMethod.GET)
 	public List<Changetochange> changetochange(@RequestParam Map<String, Object> map) {
 		return formsService.changetochange(map);
 package com.bsth.data.car_out_info;
-import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
@@ -24,7 +23,6 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * 发车信息表处理程序
@@ -208,7 +206,7 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
         bcTypeMap.put("venting", "直放");
         bcTypeMap.put("major", "放站");
         bcTypeMap.put("ldks", "两点间空驶");
-        Application.mainServices.scheduleWithFixedDelay(updateInfoThread, 60, 40, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(updateInfoThread, 60, 40, TimeUnit.SECONDS);
     }
     @Component
 package com.bsth.data.directive;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.Directive;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
 import org.slf4j.Logger;
@@ -27,6 +29,9 @@ public class DirectivesPstThread extends Thread {
     @Autowired
     D64Repository d64Repository;
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
     @Override
     public void run() {
         LinkedList<Directive> list = DayOfDirectives.pstDirectives;
@@ -37,7 +42,14 @@ public class DirectivesPstThread extends Thread {
                 directive = list.poll();
                 if (directive instanceof D60) {
-                    d60Repository.save((D60) directive);
+                    D60 d60 = (D60) directive;
+                    if(d60.isDispatch()){
+                        ScheduleRealInfo sch = d60.getSch();
+                        //如果关联的班次已经不存在了，放弃入库
+                        if(dayOfSchedule.get(sch.getId()) == null)
+                            continue;
+                    }
+                    d60Repository.save(d60);
                 }
                 if (directive instanceof D64) {
-package com.bsth.data.gpsdata.thread;
-
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import org.springframework.stereotype.Component;
-
-/**
- * 线程池监听
- * Created by panzhao on 2017/5/10.
- */
-@Component
-public class ThreadPollMonitor extends Thread{
-
-    @Override
-    public void run() {
-        long t = System.currentTimeMillis();
-
-        if(t - GpsRealAnalyse.st > 3000 * 10){
-            GpsRealAnalyse.shutdown();
-        }
-    }
-}
+package com.bsth.data.gpsdata.thread;
+
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import org.springframework.stereotype.Component;
+
+/**
+ * 线程池监听
+ * Created by panzhao on 2017/5/10.
+ */
+@Component
+public class ThreadPollMonitor extends Thread{
+
+    @Override
+    public void run() {
+        long t = System.currentTimeMillis();
+
+        if(t - GpsRealAnalyse.st > 3000 * 10){
+            GpsRealAnalyse.shutdown();
+        }
+    }
+}
 package com.bsth.entity.directive;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.NamedEntityGraphs;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import javax.persistence.*;
+
 /**
  * @author PanZhao
@@ -75,7 +65,7 @@ public class D60 extends Directive {
      * 相关联的班次
      */
     @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
     private ScheduleRealInfo sch;
     public Long getReply46Time() {
@@ -132,14 +132,14 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		// 发送指令
 		int code = GatewayHttpUtils.postJson(jObj.toJSONString());
-		// 添加到缓存，等待入库
 		d60.setDispatch(true);
 		d60.setSch(sch);
 		d60.setHttpCode(code);
-		dayOfDirectives.put60(d60);
 		if (code == 0) {
 			sch.setDirectiveState(60);
+			// 添加到缓存，延迟入库
+			dayOfDirectives.put60(d60);
 			// 通知页面
 			sendD60ToPage(sch);
 		}
@@ -407,7 +407,19 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " select c.*,l.line_code   from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1  ";
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String gs="";
+		if(map.get("gsdm")!=null){
+			gs=map.get("gsdm").toString();
+		}
+		String fgs="";
+		if(map.get("fgsdm")!=null){
+			fgs =map.get("fgsdm").toString();
+		}
+		/*String sql = " select c.*,l.line_code   from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1  ";
 		if (!map.get("startDate").toString().equals(" ") && !map.get("endDate").toString().equals(" ")) {
 			sql += "and DATE_FORMAT( c.rq,'%Y-%m-%d') BETWEEN  '" + map.get("startDate").toString() + "'  and '"
 					+ map.get("endDate").toString() + "'";
@@ -419,18 +431,28 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and c.pcch!=c.pcry";
 		} else if (map.get("sel").equals("1")) {
 			sql += " and c.jhgh!=c.sjgh";
-		}
+		}*/
+		String sql="select * from bsth_c_chtoch where rq BETWEEN '"+ map.get("startDate").toString()+"' "
+				+ " and '"+map.get("endDate").toString() +"'";
+		
+		if(!line.equals("")){
+			sql +=" and xl= '"+line+"'";
+		}else{
+			sql += " and gs= '"+gs+"' and fgs= '"+fgs+"'";
+		}
+		
+		sql +=" order by rq";
 		List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() {
 			@Override
 			public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Changetochange chan = new Changetochange();
-				chan.setRq(rq);
-				chan.setGs(arg0.getString("gs"));
-				chan.setFgs(arg0.getString("fgs"));
-				chan.setXl(arg0.getString("xl"));
+				chan.setRq(arg0.getString("rq"));
+				chan.setGs(BasicData.businessCodeNameMap.get(arg0.getString("gs")));
+				chan.setFgs(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs")+"_"+arg0.getString("gs")));
+				chan.setXl(BasicData.lineCode2NameMap.get(arg0.getString("xl")));
 				chan.setLp(arg0.getString("lp"));
 				chan.setFssj(arg0.getString("fssj"));
 				chan.setXgsj(arg0.getString("xgsj"));
@@ -51,11 +51,11 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
             if(StringUtils.isEmpty(t.getEndStationName()))
                 t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+            if(t.getDestroyReason() == null)
+                t.setDestroyReason("");
             //先持久化子任务
             rs = super.save(t);
             //关联主任务
-            System.out.println("schschsch: " + sch);
-            System.out.println("sch.getcTasks()sch.getcTasks(): " + sch.getcTasks());
             sch.getcTasks().add(t);
             dayOfSchedule.save(sch);
             //直接持久化
@@ -41,6 +41,7 @@ import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.SectionRouteService;
+import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.report.CulateMileageService;
@@ -89,7 +90,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     SectionRouteService sectionRouteService;
-    
+
     @Autowired
     CulateMileageService culateMieageService;
@@ -125,16 +126,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     YlbRepository ylbRepository;
-    
+
     @Autowired
     ReportService reposrService;
-    
+
     @Autowired
     CulateMileageService culateService;
     @Autowired
     SchModifyLog schModifyLog;
+    @Autowired
+    DirectiveService directiveService;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -620,6 +624,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //数据库删除
             rs = super.delete(id);
             if(rs.get("status").equals(ResponseCode.SUCCESS)){
+                /*ScheduleRealInfo temp = super.findById(id);
+                if(temp != null){
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "删除失败，请重试！");
+                    return rs;
+                }*/
+
                 dayOfSchedule.delete(sch);
                 //更新起点应到时间
                 List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch);
@@ -729,39 +740,39 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
             Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
 //            if (px.equals("desc")) {
-                int zt = 0;
-                for (int l = 0; l < 2; l++) {
-                    for (int i = 0; i < list.size(); i++) {
-                        ScheduleRealInfo t = list.get(i);
-                        if (t.getLpName().indexOf("+") != -1) {
-                            if (zt == 0) {
-                                listNew.add(t);
-                            }
-                        } else if (pattern.matcher(t.getLpName()).matches()) {
-                            if (zt == 1) {
-                                listNew.add(t);
-                            }
-                        } else {
+            int zt = 0;
+            for (int l = 0; l < 2; l++) {
+                for (int i = 0; i < list.size(); i++) {
+                    ScheduleRealInfo t = list.get(i);
+                    if (t.getLpName().indexOf("+") != -1) {
+                        if (zt == 0) {
+                            listNew.add(t);
+                        }
+                    } else if (pattern.matcher(t.getLpName()).matches()) {
+                        if (zt == 1) {
+                            listNew.add(t);
+                        }
+                    } else {
 //                            if (zt == 2) {
 //                                listNew.add(t);
 //                            }
-                        	continue;
-                        }
+                        continue;
                     }
-                    zt++;
                 }
-                
-           	 Collections.sort(list, new ComparableLp());
-           	 for (int i = 0; i < list.size(); i++) {
-           		 ScheduleRealInfo t = list.get(i);
-           		 if (t.getLpName().indexOf("+") != -1) {
-           			 continue;
-                 } else if (pattern.matcher(t.getLpName()).matches()) {
-                	 continue;
-                 } else {
-                	 listNew.add(t);
-                 }
-			}
+                zt++;
+            }
+
+            Collections.sort(list, new ComparableLp());
+            for (int i = 0; i < list.size(); i++) {
+                ScheduleRealInfo t = list.get(i);
+                if (t.getLpName().indexOf("+") != -1) {
+                    continue;
+                } else if (pattern.matcher(t.getLpName()).matches()) {
+                    continue;
+                } else {
+                    listNew.add(t);
+                }
+            }
             /*} else {
                 int zt = 0;
                 for (int l = 0; l < 3; l++) {
@@ -804,17 +815,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
 //        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
-    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
-    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
-    		ScheduleRealInfo s=scheduleRealInfos.get(i);
-    		if(s.getZdsjActual()!=null){
-    			lists.add(s);
-    		}
-		}
+        List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < scheduleRealInfos.size(); i++) {
+            ScheduleRealInfo s=scheduleRealInfos.get(i);
+            if(s.getZdsjActual()!=null){
+                lists.add(s);
+            }
+        }
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-      //计算里程和班次数，并放入Map里
+        //计算里程和班次数，并放入Map里
         Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
         map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
@@ -833,33 +844,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //      map=new HashMap<String,Object>();
         Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-                maps = new HashMap<String, Object>();
-                try {
-                    scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
-                    scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
-                    maps = rru.getMapValue(scheduleRealInfo);
-                    String zdsj = scheduleRealInfo.getZdsj();
-                    String zdsjActual = scheduleRealInfo.getZdsjActual();
-                    if (zdsj != null && zdsjActual != null &&
-                            !zdsj.equals(zdsjActual)) {
-                        if (zdsj.compareTo(zdsjActual) > 0) {
-                        	maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                        	maps.put("slow", "");
-                        } else {
-                        	maps.put("fast", "");
-                        	maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                        }
+            maps = new HashMap<String, Object>();
+            try {
+                scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
+                scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
+                maps = rru.getMapValue(scheduleRealInfo);
+                String zdsj = scheduleRealInfo.getZdsj();
+                String zdsjActual = scheduleRealInfo.getZdsjActual();
+                if (zdsj != null && zdsjActual != null &&
+                        !zdsj.equals(zdsjActual)) {
+                    if (zdsj.compareTo(zdsjActual) > 0) {
+                        maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        maps.put("slow", "");
                     } else {
-                    	maps.put("fast", "");
-                    	maps.put("slow", "");
+                        maps.put("fast", "");
+                        maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
                     }
-                    listMap.add(maps);
-                } catch (Exception e) {
-                    e.printStackTrace();
+                } else {
+                    maps.put("fast", "");
+                    maps.put("slow", "");
                 }
+                listMap.add(maps);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
-        
+
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
@@ -1269,6 +1280,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     ts.add(next);
                 }
+                if(!next.getXlBm().equals(sch.getXlBm())){
+                    directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                }
+
                 //重新计算车辆执行班次
                 dayOfSchedule.reCalcExecPlan(sch.getClZbh());
             } else if(StringUtils.isNotEmpty(sch.getZdsjActual()) && StringUtils.isEmpty(zdsjActual)){
@@ -1638,38 +1653,38 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //        map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
         return map;
     }*/
-    
+
     public Map<String, Object> findKMBC(String jGh, String clZbh,
-            String lpName, String date, String line) {
-    	Map<String, Object> map = new HashMap<String, Object>();
-    	List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
-    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
-    	for (int i = 0; i < list.size(); i++) {
-    		ScheduleRealInfo s=list.get(i);
-    		if(s.getZdsjActual()!=null){
-    			lists.add(s);
-    		}
-		}
-    	double ksgl=culateService.culateKsgl(list);
-    	double sjgl=culateService.culateSjgl(lists);
-    	double jccgl=culateService.culateJccgl(lists);
-    	double ljgl=culateService.culateLjgl(lists);
-    	
-    	 map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
-         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
-         map.put("addMileage", ljgl); //临加公里
-         map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
-         map.put("ksgl", ksgl);//空驶公里
-         map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
+                                        String lpName, String date, String line) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+        List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo s=list.get(i);
+            if(s.getZdsjActual()!=null){
+                lists.add(s);
+            }
+        }
+        double ksgl=culateService.culateKsgl(list);
+        double sjgl=culateService.culateSjgl(lists);
+        double jccgl=culateService.culateJccgl(lists);
+        double ljgl=culateService.culateLjgl(lists);
+
+        map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
+        map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
+        map.put("addMileage", ljgl); //临加公里
+        map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
+        map.put("ksgl", ksgl);//空驶公里
+        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-         map.put("jhbc", culateService.culateJhbc(list,""));
-         map.put("cjbc", culateService.culateLbbc(list));
-         map.put("ljbc", culateService.culateLjbc(lists,""));
-         map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
-         map.put("jcclc", jccgl);
-         map.put("zkslc", Arith.add(ksgl,jccgl));
+        map.put("jhbc", culateService.culateJhbc(list,""));
+        map.put("cjbc", culateService.culateLbbc(list));
+        map.put("ljbc", culateService.culateLjbc(lists,""));
+        map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
+        map.put("jcclc", jccgl);
+        map.put("zkslc", Arith.add(ksgl,jccgl));
 //         map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
-    	return map;
+        return map;
     }
@@ -1792,38 +1807,38 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
         String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
-		String[] minSjs = minfcsj.split(":");
-		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
-		
+        String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String[] minSjs = minfcsj.split(":");
+        Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+
         for (int i = 0; i < list.size(); i++) {
-			ScheduleRealInfo s=list.get(i);
-			String[] fcsj= s.getFcsj().split(":");
-			Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
-			
-			Long fscjT=0L;
-			if(fcsjL<minSj){
-				Calendar   calendar   =   new   GregorianCalendar(); 
-				calendar.setTime(s.getScheduleDate());
-				calendar.add(calendar.DATE,1);
-				s.setScheduleDate(calendar.getTime());
-				try {
-					fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				
-			}else{
-				try {
-					fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				};
-			}
-			s.setFcsjT(fscjT);
-		}
+            ScheduleRealInfo s=list.get(i);
+            String[] fcsj= s.getFcsj().split(":");
+            Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
+
+            Long fscjT=0L;
+            if(fcsjL<minSj){
+                Calendar   calendar   =   new   GregorianCalendar();
+                calendar.setTime(s.getScheduleDate());
+                calendar.add(calendar.DATE,1);
+                s.setScheduleDate(calendar.getTime());
+                try {
+                    fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            }else{
+                try {
+                    fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                };
+            }
+            s.setFcsjT(fscjT);
+        }
         Collections.sort(list, new ComparableReal());
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
@@ -1847,31 +1862,31 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 remarks += "(烂班)";
                 s.setRemarks(remarks);
             }
-            
+
             listSchedule.add(s);
             //计算营运里程，空驶里程
             if (!childTaskPlans.isEmpty()) {
 //            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-            	 List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
-            	 Collections.sort(listit, new ComparableChild());
-            	 for (int j = 0; j < listit.size(); j++) {
-            		 ScheduleRealInfo t = new ScheduleRealInfo();
-                     ChildTaskPlan childTaskPlan = listit.get(j);
-                     if (childTaskPlan.isDestroy()) {
-                    	 t.setFcsjActual("");
-                         t.setZdsjActual("");
-                         t.setJhlc(0.0);
-                     } else {
-                         t.setFcsjActual(childTaskPlan.getStartDate());
-                         t.setZdsjActual(childTaskPlan.getEndDate());
-                         t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
-                     }
-                     t.setQdzName(childTaskPlan.getStartStationName());
-                     t.setZdzName(childTaskPlan.getEndStationName());
-                     t.setRemarks(childTaskPlan.getRemarks());
-                     t.setAdjustExps("子");
-                     listSchedule.add(t);
-            	 }
+                List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+                Collections.sort(listit, new ComparableChild());
+                for (int j = 0; j < listit.size(); j++) {
+                    ScheduleRealInfo t = new ScheduleRealInfo();
+                    ChildTaskPlan childTaskPlan = listit.get(j);
+                    if (childTaskPlan.isDestroy()) {
+                        t.setFcsjActual("");
+                        t.setZdsjActual("");
+                        t.setJhlc(0.0);
+                    } else {
+                        t.setFcsjActual(childTaskPlan.getStartDate());
+                        t.setZdsjActual(childTaskPlan.getEndDate());
+                        t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                    }
+                    t.setQdzName(childTaskPlan.getStartStationName());
+                    t.setZdzName(childTaskPlan.getEndStationName());
+                    t.setRemarks(childTaskPlan.getRemarks());
+                    t.setAdjustExps("子");
+                    listSchedule.add(t);
+                }
             	 /* String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + "  order by start_date ";
                 List<ScheduleRealInfo> lists = jdbcTemplate.query(sqlPc,
                         new RowMapper<ScheduleRealInfo>() {
@@ -1924,62 +1939,62 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<Map<String, Object>> statisticsDaily(String line, String date,
                                                      String xlName, String type) {
-    	List<Map<String, Object>> lMap= new ArrayList<Map<String, Object>>();
-    	List<ScheduleRealInfo>list_s=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
-    	List<ScheduleRealInfo>  lists =new ArrayList<ScheduleRealInfo>();
-    	for (int i = 0; i < list_s.size(); i++) {
-			ScheduleRealInfo s=list_s.get(i);
-			if(s.getZdsjActual()!=null){
-				lists.add(s);
-			}
-		}
-    	Map<String, Object> map = new HashMap<String, Object>();
-    	 map.put("xlName", xlName);
-    	 double jhlc=culateService.culateJhgl(list_s);
-         map.put("jhlc",jhlc);
-         map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
-         double lbgl=culateService.culateLbgl(list_s);
-         map.put("ssgl", lbgl);
-         map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
-         map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
-         map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
-         map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
-         map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
-         map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
-         map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
-         map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
-         map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
-         map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
-         double ssgl_pc=culateService.culateCJLC(list_s, "配车");
-         double ssgl_by=culateService.culateCJLC(list_s, "保养");
-         double ssgl_cj=culateService.culateCJLC(list_s, "抽减");
-         double ssgl_qt=culateService.culateCJLC(list_s, "其他");
-         map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
-         map.put("ssbc", culateService.culateLbbc(list_s));
-         double ljgl=culateService.culateLjgl(lists);
-         map.put("ljgl", ljgl);
-         map.put("jhbc", culateService.culateJhbc(list_s,""));
-         map.put("jhbc_m", culateService.culateJhbc(list_s, "zgf"));
-         map.put("jhbc_a", culateService.culateJhbc(list_s, "wgf"));
-         map.put("sjbc", culateService.culateSjbc(lists,""));
-         map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
-         map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
-         map.put("ljbc", culateService.culateLjbc(lists,""));
-         map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
-         map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
-         map.put("fzbc", culateService.culateFzbc(lists, ""));
-         map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
-         map.put("fzbc_a",  culateService.culateFzbc(lists, "wgf"));
-         map.put("dtbc", 0);
-         map.put("dtbc_m", 0);
-         map.put("dtbc_a", 0);
-         map.put("djg", 0);
-         map.put("djg_m", 0);
-         map.put("djg_a", 0);
-         map.put("djg_time", 0);
-         map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
-         lMap.add(map);
-    	return lMap;
+        List<Map<String, Object>> lMap= new ArrayList<Map<String, Object>>();
+        List<ScheduleRealInfo>list_s=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+        List<ScheduleRealInfo>  lists =new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < list_s.size(); i++) {
+            ScheduleRealInfo s=list_s.get(i);
+            if(s.getZdsjActual()!=null){
+                lists.add(s);
+            }
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("xlName", xlName);
+        double jhlc=culateService.culateJhgl(list_s);
+        map.put("jhlc",jhlc);
+        map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
+        double lbgl=culateService.culateLbgl(list_s);
+        map.put("ssgl", lbgl);
+        map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
+        map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
+        map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
+        map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
+        map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
+        map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
+        map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
+        map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
+        map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
+        map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
+        double ssgl_pc=culateService.culateCJLC(list_s, "配车");
+        double ssgl_by=culateService.culateCJLC(list_s, "保养");
+        double ssgl_cj=culateService.culateCJLC(list_s, "抽减");
+        double ssgl_qt=culateService.culateCJLC(list_s, "其他");
+        map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
+        map.put("ssbc", culateService.culateLbbc(list_s));
+        double ljgl=culateService.culateLjgl(lists);
+        map.put("ljgl", ljgl);
+        map.put("jhbc", culateService.culateJhbc(list_s,""));
+        map.put("jhbc_m", culateService.culateJhbc(list_s, "zgf"));
+        map.put("jhbc_a", culateService.culateJhbc(list_s, "wgf"));
+        map.put("sjbc", culateService.culateSjbc(lists,""));
+        map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
+        map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
+        map.put("ljbc", culateService.culateLjbc(lists,""));
+        map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
+        map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
+        map.put("fzbc", culateService.culateFzbc(lists, ""));
+        map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
+        map.put("fzbc_a",  culateService.culateFzbc(lists, "wgf"));
+        map.put("dtbc", 0);
+        map.put("dtbc_m", 0);
+        map.put("dtbc_a", 0);
+        map.put("djg", 0);
+        map.put("djg_m", 0);
+        map.put("djg_a", 0);
+        map.put("djg_time", 0);
+        map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
+        lMap.add(map);
+        return lMap;
     }
   /*  @Override
@@ -2527,34 +2542,34 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return lMap;
     }*/
-    
+
     public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){
-    	List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
-    	for(int i=0;i<list.size();i++){
-    		ScheduleRealInfo s=list.get(i);
-    		if(s.getZdsjActual()!=null){
-    			lists.add(s);
-    		}
-    	}
-    	Map<String, Object> map = new HashMap<String, Object>();
-   	 	map.put("xlName", lists.get(0).getXlName());
-	   	 double jhyygl=culateService.culateJhgl(list);//计划营运公里
-		 double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
-	     map.put("jhlc", jhyygl);
-	     map.put("jcclc", jhjcclc);
-	     map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
-	     
-	     double ljgl= culateService.culateLjgl(lists);
-	     double sjyygl= culateService.culateSjgl(lists);
-	     double zyygl= Arith.add(sjyygl,ljgl);
-	     
-	     double sjjccgl=culateService.culateJccgl(lists);
-	     double sjksgl=culateService.culateKsgl(lists);
-	     double zksgl=Arith.add(sjjccgl, sjksgl);
-	     map.put("sjzgl", Arith.add(zyygl, zksgl));
-	     map.put("sjgl",zyygl);
-	     map.put("sjksgl", zksgl);
-	     
+        List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
+        for(int i=0;i<list.size();i++){
+            ScheduleRealInfo s=list.get(i);
+            if(s.getZdsjActual()!=null){
+                lists.add(s);
+            }
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("xlName", lists.get(0).getXlName());
+        double jhyygl=culateService.culateJhgl(list);//计划营运公里
+        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+        map.put("jhlc", jhyygl);
+        map.put("jcclc", jhjcclc);
+        map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
+
+        double ljgl= culateService.culateLjgl(lists);
+        double sjyygl= culateService.culateSjgl(lists);
+        double zyygl= Arith.add(sjyygl,ljgl);
+
+        double sjjccgl=culateService.culateJccgl(lists);
+        double sjksgl=culateService.culateKsgl(lists);
+        double zksgl=Arith.add(sjjccgl, sjksgl);
+        map.put("sjzgl", Arith.add(zyygl, zksgl));
+        map.put("sjgl",zyygl);
+        map.put("sjksgl", zksgl);
+
         map.put("ssgl", culateService.culateLbgl(list));
         map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
         map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
@@ -2588,66 +2603,66 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("djg_m", 0);
         map.put("djg_a", 0);
         map.put("djg_time", 0);
-    	return map;
+        return map;
     }
-    
+
     @Override
     public List<Map<String, Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2,
-                                                     String xlName, String type) {
+                                                       String xlName, String type) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
         line =line.trim();
         if(line.equals("")){
-        	//查询所有线路
-        	list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
+            //查询所有线路
+            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
         }else{
-        	//查询单条线路
-        	list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
+            //查询单条线路
+            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
         }
         for (int i = 0; i < list.size(); i++) {
-        	ScheduleRealInfo s=list.get(i);
-        	if(s.getZdsjActual()!=null){
-        		list_s.add(s);
-        	}
-		}
+            ScheduleRealInfo s=list.get(i);
+            if(s.getZdsjActual()!=null){
+                list_s.add(s);
+            }
+        }
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         for (int i = 0; i < list.size(); i++) {
-        	if(i<list.size()-1){
-        		if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
-        			lists.add(list.get(i));
-        		}else{
-        			lists.add(list.get(i));
-        			Map<String, Object> map=staticTj(lists);
-        			lMap.add(map);
-        			lists=new ArrayList<ScheduleRealInfo>();
-        		}
-        	}else{
-        		if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
-        			lists.add(list.get(i));
-        			Map<String, Object> map=staticTj(lists);
-        			lMap.add(map);
-        		}else{
-        			lists=new  ArrayList<ScheduleRealInfo>();
-        			lists.add(list.get(i));
-        			Map<String, Object> map=staticTj(lists);
-        			lMap.add(map);
-        		}
-        	}
+            if(i<list.size()-1){
+                if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
+                    lists.add(list.get(i));
+                }else{
+                    lists.add(list.get(i));
+                    Map<String, Object> map=staticTj(lists);
+                    lMap.add(map);
+                    lists=new ArrayList<ScheduleRealInfo>();
+                }
+            }else{
+                if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
+                    lists.add(list.get(i));
+                    Map<String, Object> map=staticTj(lists);
+                    lMap.add(map);
+                }else{
+                    lists=new  ArrayList<ScheduleRealInfo>();
+                    lists.add(list.get(i));
+                    Map<String, Object> map=staticTj(lists);
+                    lMap.add(map);
+                }
+            }
         }
-       
+
         Map<String, Object> map = new HashMap<String, Object>();
-   	 	map.put("xlName", "合计");
-   	 	double jhyygl=culateService.culateJhgl(list);//计划营运公里
-   	 	double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+        map.put("xlName", "合计");
+        double jhyygl=culateService.culateJhgl(list);//计划营运公里
+        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
         map.put("jhlc", jhyygl);
         map.put("jcclc", jhjcclc);
         map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
-        
+
         double ljgl= culateService.culateLjgl(list_s);
         double sjyygl= culateService.culateSjgl(list_s);
         double zyygl= Arith.add(sjyygl,ljgl);
-        
+
         double sjjccgl=culateService.culateJccgl(list_s);
         double sjksgl=culateService.culateKsgl(list_s);
         double zksgl=Arith.add(sjjccgl, sjksgl);
@@ -2965,10 +2980,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
 //        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();
-           
+
 //            double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
             double addMileage = 0, remMileage = 0;
             Map<String, Object> map = new HashMap<String, Object>();
@@ -2977,14 +2992,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             String bCompany="";
             List<ScheduleRealInfo> listS=new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
-            	if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)){
-	                if (fage) {
-	                    //根据线路代码获取公司
-	                	company=scheduleRealInfo.getGsBm();
-	                	bCompany=scheduleRealInfo.getFgsBm();
-	                    fage = false;
-	                }
-	                listS.add(scheduleRealInfo);
+                if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)){
+                    if (fage) {
+                        //根据线路代码获取公司
+                        company=scheduleRealInfo.getGsBm();
+                        bCompany=scheduleRealInfo.getFgsBm();
+                        fage = false;
+                    }
+                    listS.add(scheduleRealInfo);
 	               /* if (scheduleRealInfo != null) {
 	                    //计划里程（主任务过滤掉临加班次），
@@ -3046,9 +3061,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                        }
 	                    }
 	                }*/
-	            }
+                }
             }
-            
+
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
 //            Double zgl=Arith.add(yygl,ksgl);
@@ -3800,9 +3815,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         }
                         if (!c.isDestroy()) {
-                        	if(c.getMileageType().equals("service")){
-                        		sjlc += c.getMileage() == null ? 0 : c.getMileage();
-                        	}
+                            if(c.getMileageType().equals("service")){
+                                sjlc += c.getMileage() == null ? 0 : c.getMileage();
+                            }
                         }
                     }
@@ -3866,14 +3881,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             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(",")>0)){
-	            	if(!(dbdp.length()>0)){
-	            		dbdp  =t.getuName();
-	            	}else{
-	            		dbdp +=","+t.getuName();
-	            	}
-            	}
+                DutyEmployee t = list.get(i);
+                if(!(dbdp.indexOf(",")>0)){
+                    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) {
@@ -3958,18 +3973,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     if (!scheduleRealInfo.getsGh().equals(sgh)) {
                         sgh = scheduleRealInfo.getsGh()==null?"":scheduleRealInfo.getsGh();
                         if(!sgh.equals("")){
-	                        if (map.get("sjb1") != null) {
-	                            if (map.get("sjb2") != null) {
-	                                map.put("sjb3", scheduleRealInfo.getsGh() + "/" +
-	                                        scheduleRealInfo.getFcsjActual());
-	                            } else {
-	                                map.put("sjb2", scheduleRealInfo.getsGh() + "/" +
-	                                        scheduleRealInfo.getFcsjActual());
-	                            }
-	                        } else {
-	                            map.put("sjb1", scheduleRealInfo.getsGh() + "/" +
-	                                    scheduleRealInfo.getFcsjActual());
-	                        }
+                            if (map.get("sjb1") != null) {
+                                if (map.get("sjb2") != null) {
+                                    map.put("sjb3", scheduleRealInfo.getsGh() + "/" +
+                                            scheduleRealInfo.getFcsjActual());
+                                } else {
+                                    map.put("sjb2", scheduleRealInfo.getsGh() + "/" +
+                                            scheduleRealInfo.getFcsjActual());
+                                }
+                            } else {
+                                map.put("sjb1", scheduleRealInfo.getsGh() + "/" +
+                                        scheduleRealInfo.getFcsjActual());
+                            }
                         }
                     }
                 }
@@ -4059,7 +4074,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String xlName = map.get("xlName").toString();
         String state = map.get("state").toString();
         String type = map.get("type").toString();
-        
+
         List<Map<String, Object>> dataList2 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> dataList3 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> list1 = this.statisticsDaily(line, date, xlName, null);
@@ -4136,10 +4151,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             String fcsjActural=schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "";
             String bcType=schedule.getBcType()!=null?schedule.getBcType():"";
             if(bcType.equals("in")){
-            	fcsjActural=fcsjActural+"(进)";
+                fcsjActural=fcsjActural+"(进)";
             }
             if(bcType.equals("out")){
-            	fcsjActural=fcsjActural+"(出)";
+                fcsjActural=fcsjActural+"(出)";
             }
             tempMap.put("fcsjActual" + size, fcsjActural);
             tempMap.put("fcsjk" + size, "");
@@ -4201,13 +4216,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> scheduleRealInfos = listpl;
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
 //        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
-    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
-    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
-    		ScheduleRealInfo s=scheduleRealInfos.get(i);
-    		if(s.getZdsjActual()!=null){
-    			lists.add(s);
-    		}
-		}
+        List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < scheduleRealInfos.size(); i++) {
+            ScheduleRealInfo s=scheduleRealInfos.get(i);
+            if(s.getZdsjActual()!=null){
+                lists.add(s);
+            }
+        }
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
@@ -4229,33 +4244,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-                maps = new HashMap<String, Object>();
-                try {
-                    scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
-                    scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
-                    maps = rru.getMapValue(scheduleRealInfo);
-                    String zdsj = scheduleRealInfo.getZdsj();
-                    String zdsjActual = scheduleRealInfo.getZdsjActual();
-                    if (zdsj != null && zdsjActual != null &&
-                            !zdsj.equals(zdsjActual)) {
-                        if (zdsj.compareTo(zdsjActual) > 0) {
-                            maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                            maps.put("slow", "");
-                        } else {
-                            maps.put("fast", "");
-                            maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                        }
+            maps = new HashMap<String, Object>();
+            try {
+                scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
+                scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
+                maps = rru.getMapValue(scheduleRealInfo);
+                String zdsj = scheduleRealInfo.getZdsj();
+                String zdsjActual = scheduleRealInfo.getZdsjActual();
+                if (zdsj != null && zdsjActual != null &&
+                        !zdsj.equals(zdsjActual)) {
+                    if (zdsj.compareTo(zdsjActual) > 0) {
+                        maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        maps.put("slow", "");
                     } else {
                         maps.put("fast", "");
-                        maps.put("slow", "");
+                        maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
                     }
-                    listMap.add(maps);
-                } catch (Exception e) {
-                    e.printStackTrace();
+                } else {
+                    maps.put("fast", "");
+                    maps.put("slow", "");
                 }
+                listMap.add(maps);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
-      
+
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
         list.add(listMap.iterator());
@@ -4263,7 +4278,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
 //        return scheduleRealInfos;
     }
-    
+
     @Override
     public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
         String date = map.get("date").toString();
@@ -4287,17 +4302,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             file.mkdirs();
             List<ScheduleRealInfo> lists_line=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
             for (List<String> list : lists) {
-            	List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
+                List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
                 String jName = list.get(0);
                 String clZbh = list.get(1);
                 String lpName = list.get(2);
                 String jGh =list.get(3);
                 for (int i = 0; i < lists_line.size(); i++) {
-					ScheduleRealInfo s=lists_line.get(i);
-					if(s.getjGh().equals(jGh) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
-						newList.add(s);
-					}
-				}
+                    ScheduleRealInfo s=lists_line.get(i);
+                    if(s.getjGh().equals(jGh) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
+                        newList.add(s);
+                    }
+                }
                 this.exportWaybill_pl(newList, date, jName, clZbh, lpName);
                 File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
                 String fileName = file.getName();
@@ -558,7 +558,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
-                    if(c.isDestroy() && c.getDestroyReason().equals(item))
+                    if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
                         sum = Arith.add(sum, c.getMileage());
                 }
             }
@@ -6,29 +6,29 @@ import com.bsth.data.BasicData;
 import com.google.common.base.Splitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 /**
  * @author PanZhao
  */
 @Component
-@Scope("prototype")
 public class RealControlSocketHandler implements WebSocketHandler {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	private static ArrayList<WebSocketSession> users;
-	//private static final ArrayListMultimap<String, WebSocketSession> listenMap;
-	private static ConcurrentHashMap<String, List<WebSocketSession>> listenMap;
+	private static ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSession>> listenMap;
 	static {
 		users = new ArrayList<WebSocketSession>();
-		//listenMap = ArrayListMultimap.create();
 		listenMap = new ConcurrentHashMap();
 	}
@@ -37,30 +37,13 @@ public class RealControlSocketHandler implements WebSocketHandler {
 			throws Exception {
 		users.remove(session);
 		//清理监听
-		//Set<String> keys = listenMap.keySet();
-		//Map<String, WebSocketSession> remMap = new HashMap<>();
-
 		int vsCount=0;
-		Collection<List<WebSocketSession>> vs = listenMap.values();
-		for(List<WebSocketSession> list : vs){
+		Collection<CopyOnWriteArrayList<WebSocketSession>> vs = listenMap.values();
+		for(CopyOnWriteArrayList<WebSocketSession> list : vs){
 			list.remove(session);
 			vsCount += list.size();
 		}
-		/*List<WebSocketSession> vs;
-		for(String k : keys){
-			//vs = listenMap.get(k);
-			//vs.remove(session);
-			listenMap.get(k).remove()
-			*//*if(listenMap.get(k).contains(session))
-				remMap.put(k, session);*//*
-		}*/
-
-		/*Set<String> remSet = remMap.keySet();
-		for(String k : remSet){
-			listenMap.remove(k, remMap.get(k));
-			logger.info("web socket close, remove listen K: "+ k);
-		}*/
 		logger.info("listen values size: " + vsCount + " -CloseStatus:" + arg1);
 	}
@@ -81,7 +64,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				for(String lineCode : idx){
 					if(BasicData.lineCode2NameMap.containsKey(lineCode)){
 						if(!listenMap.containsKey(lineCode)){
-							listenMap.put(lineCode, new ArrayList<WebSocketSession>());
+							listenMap.put(lineCode, new CopyOnWriteArrayList<WebSocketSession>());
 						}
 						listenMap.get(lineCode).add(session);
 					}
@@ -10,10 +10,8 @@ spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password=
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password= root
+spring.datasource.password= root
+
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -29,7 +27,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
@@ -70,14 +70,14 @@
 							class="form-control" type="text" id="endDate"
 							style="width: 140px;" />
 					</div>
-					<div style="display: inline-block; margin-left: 10px;">
-						<span class="item-label" style="width: 120px;">类型: </span> <select
-							class="form-control" id="sel">
-							<option value="">请选择</option>
-							<option value="1">换人</option>
-							<option value="2">换车</option>
-						</select>
-					</div>
+<!-- 					<div style="display: inline-block; margin-left: 10px;"> -->
+<!-- 						<span class="item-label" style="width: 120px;">类型: </span> <select -->
+<!-- 							class="form-control" id="sel"> -->
+<!-- 							<option value="">请选择</option> -->
+<!-- 							<option value="1">换人</option> -->
+<!-- 							<option value="2">换车</option> -->
+<!-- 						</select> -->
+<!-- 					</div> -->
 					<div class="form-group">
 						<input class="btn btn-default" type="button" id="query" value="筛选" />
 						<input class="btn btn-default" type="button" id="export"
@@ -117,10 +117,8 @@
 							<tr>
 								<td>车号</td>
 								<td>车号</td>
-								<td>工号</td>
-								<td>人员</td>
-								<td>工号</td>
-								<td>人员</td>
+								<td colspan="2">工号/人员</td>
+								<td colspan="2">工号/人员</td>
 							</tr>
 						</thead>
 						<tbody>
@@ -188,6 +186,7 @@
 		$("#fgsdmChange").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id: " ", text: "请选择"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -223,29 +222,15 @@
 					var gsdmChange= $("#gsdmChange").val();
 				    var fgsdmChange= $("#fgsdmChange").val();
 					if (startDate1 != '' && endDate1 != '') {
-						$post('/mcy_forms/changetochange', {
+						$get('/mcy_forms/changetochange', {
 							sel : sel,
 							line : line,
 							startDate : $("#startDate").val(),
 							endDate : $("#endDate").val(),
+							gsdm:gsdmChange,
+							fgsdm:fgsdmChange,
 							type : 'query'
 						}, function(result) {
-							startDate = $("#startDate").val();
-							endDate = $("#endDate").val();
-							$("#sDate").text(startDate);
-							$("#eDate").text(endDate);
-							var temp = {};
-							var today_account = 0;
-							temp["line"] = $("#line").text();
-							$.each(result, function(i, obj) {
-								if (moment(obj.schedule_date_str).format(
-										"YYYY-MM-DD") == moment(obj.startDate)
-										.format("YYYY-MM-DD")) {
-									today_account++;
-								}
-								obj.updateDate = moment(obj.startDate).format(
-										"YYYY-MM-DD HH:mm:ss");
-							});
 							// 把数据填充到模版中
 							var tbodyHtml = template('changetochange', {
 								list : result
@@ -294,11 +279,9 @@
 			<td>{{obj.fssj}}</td>
 			<td>{{obj.xgsj}}</td>
 			<td>{{obj.pcch}}</td>
-			<td>{{obj.pcry}}</td>
-			<td>{{obj.jhgh}}</td>
-			<td>{{obj.jhch}}</td>
-			<td>{{obj.sjgh}}</td>
 			<td>{{obj.sjch}}</td>
+			<td colspan="2">{{obj.pcry}}</td>
+			<td colspan="2">{{obj.sjgh}}</td>
 			<td>{{obj.yy}}</td>
 			<td>{{obj.xgr}}</td>
 		</tr>
-<div class="uk-modal" id="directive-history-modal">
+<div class="uk-modal ct_move_modal" id="directive-history-modal">
     <div class="uk-modal-dialog" style="width: 1040px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
@@ -15,12 +15,12 @@
                     </legend>
                     <span class="horizontal-field">指令类型</span>
                     <select name="dType">
-                    <option value="-1">全部</option>
-                    <option value="3">消息短语</option>
-                    <option value="0">调度指令</option>
-                    <option value="1">运营指令</option>
-                    <option value="2">线路切换指令</option>
-                </select>
+                        <option value="-1">全部</option>
+                        <option value="3">消息短语</option>
+                        <option value="0">调度指令</option>
+                        <option value="1">运营指令</option>
+                        <option value="2">线路切换指令</option>
+                    </select>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form" id="uk-autocomplete-cars">
                         <input type="text" name="nbbm" placeholder="车辆自编号">
@@ -33,13 +33,13 @@
         <div style="height: 495px;margin:5px 0 -18px;">
             <table class="ct-fixed-table uk-table uk-table-hover">
                 <thead>
-                    <tr>
-                        <th style="width: 6%;">时间</th>
-                        <th style="width: 8%;">车辆</th>
-                        <th style="width: 44%;">指令内容</th>
-                        <th style="width: 7%;">发送人</th>
-                        <th style="width: 15%;">状态</th>
-                    </tr>
+                <tr>
+                    <th style="width: 6%;">时间</th>
+                    <th style="width: 8%;">车辆</th>
+                    <th style="width: 44%;">指令内容</th>
+                    <th style="width: 7%;">发送人</th>
+                    <th style="width: 15%;">状态</th>
+                </tr>
                 </thead>
                 <tbody>
                 </tbody>
@@ -61,14 +61,14 @@
             <td>
                 {{if obj.errorText != null}}
                 <div class="uk-badge uk-badge-danger"> {{obj.errorText}}</div>
-                {{else}}
-                  {{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>
-                  {{else if obj.reply46 == 0 && obj.reply47 == 0}}
-                  <div class="uk-badge"> 驾驶员已确认</div>
-                  {{/if}}
+                {{else if obj.operCode==96}}
+                {{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>
+                {{else if obj.reply46 == 0 && obj.reply47 == 0}}
+                <div class="uk-badge"> 驾驶员已确认</div>
+                {{/if}}
                 {{/if}}
             </td>
         </tr>
@@ -87,17 +87,17 @@
             var carInput = $('#uk-autocomplete-cars input');
             var search_nbbm = function(release) {
                 var q = carInput.val().toUpperCase(),
-                    rs = [],
-                    max = 12,
-                    count = 0;
+                        rs = [],
+                        max = 12,
+                        count = 0;
                 $.each(cars, function(i, item) {
                     if (item.indexOf(q) != -1){
-                      rs.push({
-                          value: item,
-                          title: item
-                      });
-                      count ++;
+                        rs.push({
+                            value: item,
+                            title: item
+                        });
+                        count ++;
                     }
                     if (count >= max)
                         return false;
@@ -156,7 +156,7 @@
             var resetPagination = true;
             var pagination = function(pages, currentPage) {
                 var wrap = $('.pagination-wrap', modal).empty()
-                  ,e = $('<ul class="uk-pagination"></ul>').appendTo(wrap);
+                        ,e = $('<ul class="uk-pagination"></ul>').appendTo(wrap);
                 var pagination = UIkit.pagination(e, {
                     pages: pages,
@@ -164,8 +164,8 @@
                 });
                 e.on('select.uk.pagination', function(e, pageIndex){
-                  page = pageIndex;
-                  query();
+                    page = pageIndex;
+                    query();
                 });
                 resetPagination = false;