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

徐烜
2 parents 67e8b890 93decfc0
Showing 7 changed files with 153 additions and 58 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/north.css
@@ -54,27 +54,19 @@ public class CarOutInfoHandler {
      * 全量更新发车信息表
      */
     public void updateAll() {
-        Set<String> ks = BasicData.lineCode2NameMap.keySet();
-        for (String lineCode : ks) {
-            update(lineCode);
-        }
-    }
-
-    public void update(String lineCode) {
-        try {
-            ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
-            List<ScheduleRealInfo> list = new ArrayList<>();
+        try{
+            //将班次按线路分组
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create();
+            for(ScheduleRealInfo sch : all){
+                xlMaps.put(sch.getXlBm(), sch);
+            }
-            Set<String> ks = lpScheduleMap.keySet();
-            String prefix = lineCode + "_";
+            Set<String> ks = xlMaps.keySet();
             for (String k : ks) {
-                if (k.startsWith(prefix)) {
-                    list.addAll(lpScheduleMap.get(k));
-                }
+                update(xlMaps.get(k));
             }
-
-            update(list);
-        } catch (Exception e) {
+        }catch (Exception e){
             logger.error("", e);
         }
     }
@@ -338,6 +338,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(lpNext != null){
                 lpNext.setQdzArrDatesj(sch.getZdsjActual());
             }
+            else{
+                logger.info(sch.getClZbh() + " 到终点，无下一班");
+            }
             //通知客户端
             sendUtils.sendZdsj(sch, lpNext, doneSum);
@@ -1029,6 +1029,11 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			 if(listInfo.size()>0){
 				  m=listDjg(peak,trough,listInfo,grade);
+			 }else{
+				 m.put("djgcsz", "0");
+				 m.put("djgcsw", "0");
+				 m.put("djgcsq", "0");
+				 m.put("djgsj", "0");
 			 }
 		}
 		return m;
@@ -873,7 +873,7 @@ public class ReportServiceImpl implements ReportService{
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
 						+ " fcsj > '"+minfcsj+"'  and bc_type!='ldks' "
 								+ " and bc_type !='region') "
-						+ " order by xl_dir, xh, lp,fcsj";
+						+ " order by  xh, lp,fcsj";
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 						new RowMapper<Map<String, Object>>(){
@@ -915,6 +915,8 @@ public class ReportServiceImpl implements ReportService{
 		int temp = 48*60+1, zcj = 0;
 		boolean ists = true;
 		String lpname="";
+		int dir =-1;
+		int fcsjT_= 0;
 		for (int i = 0; i < list.size(); i++) {
 			Map<String, Object> m=list.get(i);
 			int xlDir = Integer.valueOf(m.get("dir").toString());
@@ -927,6 +929,10 @@ public class ReportServiceImpl implements ReportService{
 				if(temp>fcsjT){
 					temp=fcsjT+bcsj;
 				}
+				dir =xlDir;
+				if(bcType.equals("in") || bcType.equals("out")){
+					ists=false;
+				}
 			}else{
 				if(temp>fcsjT){
 					temp=fcsjT+bcsj;
@@ -934,74 +940,146 @@ public class ReportServiceImpl implements ReportService{
 				if(bcType.equals("in") || bcType.equals("out")){
 					temp = fcsjT+bcsj;
 					lpname=m.get("lp").toString();
+					dir =xlDir;
 					ists=false;
 				}else{
-//					if(ists){
-//						temp = fcsjT+bcsj;
-//						lpname=m.get("lp").toString();
-//					}else{
-						if(xlDir==0){
+//						if(xlDir==0){
 							//上行数据
 							if(fcsjT>= minSj && fcsjT <= 6*60+30){
 								//早高峰前
-								yysxZq +=bcsj;
-								sxcountZqbc ++;
-								zqFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZq +=bcsj;
+									sxcountZqbc ++;
+									zqFcsj0.add(fcsjT);
+								}else{
+									yyxxZq +=bcsj;
+									xxcountZqbc ++;
+									zqFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZq +=fcsjT-temp;
+										if(dir==0)
+											tzsxZq +=fcsjT-temp;
+										else
+											tzxxZq +=fcsjT-temp;
 									}
 								}
 								temp = fcsjT+bcsj;
 							}else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
 								//早高峰
-								yysxZgf +=bcsj;
-								sxcountZgfbc ++;
-								zgfFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZgf +=bcsj;
+									sxcountZgfbc ++;
+									zgfFcsj0.add(fcsjT);
+								}else{
+									yyxxZgf +=bcsj;
+									xxcountZgfbc ++;
+									zgfFcsj1.add(fcsjT);
+								}
+								
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZgf +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT>= minSj && fcsjT <= 6*60+30)
+												tzsxZq +=fcsjT-temp;
+											else
+												tzsxZgf +=fcsjT-temp;
+										}else{
+											if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+												tzxxZq +=fcsjT-temp;
+											else
+											    tzxxZgf +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
 								//中午
-								yysxZw +=bcsj;
-								sxcountZwbc ++;
-								zwFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZw +=bcsj;
+									sxcountZwbc ++;
+									zwFcsj0.add(fcsjT);
+								}else{
+									yyxxZw +=bcsj;
+									xxcountZwbc ++;
+									zwFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZw +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+												tzsxZgf +=fcsjT-temp;
+											else
+											    tzsxZw +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+												tzxxZgf +=fcsjT-temp;
+											else
+											    tzxxZw +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else if(fcsjT > 16*60 && fcsjT <= 18*60){
 								//晚高峰
-								yysxWgf +=bcsj;
-								sxcountWgfbc ++;
-								wgfFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxWgf +=bcsj;
+									sxcountWgfbc ++;
+									wgfFcsj0.add(fcsjT);
+								}else{
+									yyxxWgf +=bcsj;
+									xxcountWgfbc ++;
+									wgfFcsj1.add(fcsjT);
+								}
+								
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxWgf +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+												tzsxZw +=fcsjT-temp;
+											else	
+											    tzsxWgf +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+												 tzxxZw +=fcsjT-temp;
+											else
+												 tzxxWgf +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else{
 								//晚高峰后
-								yysxWh +=bcsj;
-								sxcountWhbc ++;
-								whFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxWh +=bcsj;
+									sxcountWhbc ++;
+									whFcsj0.add(fcsjT);
+								}else{
+									yyxxWh +=bcsj;
+									xxcountWhbc ++;
+									whFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxWh +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+												tzsxWgf +=fcsjT-temp;
+											else
+											    tzsxWh +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+												tzxxWgf +=fcsjT-temp;
+											else
+											    tzxxWh +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}
-							lpname=m.get("lp").toString();
-						}else{
+							
+						/*}else{
 							//下行数据
 							if(fcsjT>= minSj && fcsjT <= 6*60+30){
 								//早高峰前
@@ -1021,7 +1099,10 @@ public class ReportServiceImpl implements ReportService{
 								zgfFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxZgf +=fcsjT-temp;
+										if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+											tzxxZq +=fcsjT-temp;
+										else
+										    tzxxZgf +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1032,7 +1113,10 @@ public class ReportServiceImpl implements ReportService{
 								zwFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxZw +=fcsjT-temp;
+										if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+											tzxxZgf +=fcsjT-temp;
+										else
+										    tzxxZw +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1043,7 +1127,10 @@ public class ReportServiceImpl implements ReportService{
 								wgfFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxWgf +=fcsjT-temp;
+										if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+											 tzxxZw +=fcsjT-temp;
+										else
+											 tzxxWgf +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1054,20 +1141,27 @@ public class ReportServiceImpl implements ReportService{
 								whFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxWh +=fcsjT-temp;
+										if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+											tzxxWgf +=fcsjT-temp;
+										else
+										    tzxxWh +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
 							}
 //						}
-					}
+					}*/
+						lpname=m.get("lp").toString();
+						fcsjT_=fcsjT;
+						dir =xlDir;
+						if(m.get("ists").toString().trim().equals("1")){
+							ists=false;
+						}else{
+							ists = true;
+						}
 			    }
 			}
-			if(m.get("ists").toString().trim().equals("1")){
-				ists=false;
-			}else{
-				ists = true;
-			}
+			
 		}
 		//---------------------------------------早前
@@ -57,7 +57,7 @@
                             <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　手动添加站点规划说明： </span></h5>
                             <p>
                             	<span class="help-block" style="color:#1bbc9b;">
-                            		&nbsp;请在文本域中按站点顺序依次输入站点名称（如果已有站点GPS坐标，请将坐标跟在站点名称后面用【Tab】键隔开）,每输入完一个站名时请按回车键【Enter】换行.
+                            		&nbsp;请在文本域中按站点顺序依次输入站点名称（如果已有站点GPS坐标(坐标点也用【Tab】键隔开)，请将坐标跟在站点名称后面用【Tab】键隔开）,每输入完一个站名时请按回车键【Enter】换行.
                             		例如：<br><br>
                             		浦东大道金桥路	121.496612	31.238960<br>
                             		浦东大道居家桥路	121.496618	31.238957<br>
@@ -44,6 +44,7 @@
 .line_schedule .ct_table {
     padding-top: 36px;
+	color: #000;
 }
 .line_schedule .ct_table>.ct_table_head {
@@ -358,7 +358,7 @@
 .op-beijingtime-time{
     padding-left: 0px;
-    width: 107px;
+    width: 109px;
 }
 .op-beijingtime-time>span{