update

娄高锋
1 parent 9e0c6481
Showing 2 changed files with 94 additions and 195 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/timetable/timetable.html
@@ -573,191 +573,77 @@ public class ReportServiceImpl implements ReportService{
 		//查询全程
 		String sqlqc="select t.*,x.station_name as qdz_name from ( "
-				     + "(SELECT fcsj,qdz,2 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
-					 + " where ttinfo ='"+ttinfo+"' and bc_type='normal'  and fcsj <='"+minfcsj+"' ) "
+				     + " (SELECT bc_type, fcsj,qdz,2 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
+					 + " and fcsj <='"+minfcsj+"') "
 					 + " union "
-					 + " (SELECT fcsj,qdz,1 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
-					 + " where ttinfo ='"+ttinfo+"' and bc_type='normal'  and fcsj > '"+minfcsj+"') "
-					 		+ "order by  xl_dir,xh,fcsj ) t left join bsth_c_station  x on t.qdz=x.id";
+					 + " (SELECT bc_type, fcsj,qdz,1 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
+					 + " and fcsj > '"+minfcsj+"') "
+					 + "order by  xl_dir,xh,fcsj ) t left join bsth_c_station x on t.qdz=x.id";
 		List<Map<String, String>> qclist= jdbcTemplate.query(sqlqc,
 				 new RowMapper<Map<String, String>>(){
 			 @Override
-			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, String> m=new HashMap<String,String>();
-				 m.put("qdz_name", rs.getString("qdz_name"));
-				 m.put("fcsj", rs.getString("fcsj"));
-				 m.put("xl", rs.getString("xl_dir"));
-				 return m;
-			 }
+				 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+					 Map<String, String> m=new HashMap<String,String>();
+					 m.put("qdz_name", rs.getString("qdz_name"));
+					 m.put("bcType", rs.getString("bc_type"));
+					 m.put("fcsj", rs.getString("fcsj"));
+					 m.put("xl", rs.getString("xl_dir"));
+					 m.put("xh", rs.getString("xh"));
+					 return m;
+				 }
 		});
-				
-		Map<String, Object> qcMap=new HashMap<String,Object>();
-		int num=0;
-		String sxfcsj="";
-		String xxfcsj="";
-		String sxzd="";
-		String xxzd="";
-		for (int i = 0; i < qclist.size(); i++) {
-			Map<String, String> map=qclist.get(i);
-			if(map.get("xl").equals("0")){
-				if(sxzd.equals("")){
-					sxzd=map.get("qdz_name").toString();
-					qcMap.put("sxzm", sxzd);
-					sxfcsj +=map.get("fcsj").toString()+"-";
-				}
-				if(!(qclist.get(i+1).get("xl").equals("0"))){
-					sxfcsj +=map.get("fcsj").toString();
-					qcMap.put("sxsj",sxfcsj);
-					qcMap.put("sxbc", i+1);
-					num=i+1;
-				}
-			}
-			if(map.get("xl").equals("1")){
-				if(xxzd.equals("")){
-					xxzd=map.get("qdz_name").toString();
-					xxfcsj+=map.get("fcsj").toString()+"-";
-					qcMap.put("xxzm", xxzd);
-				}
+		
+		List<List<Map<String, String>>> mapList = new ArrayList<List<Map<String,String>>>();
+		mapList.add(new ArrayList<Map<String, String>>());
+		mapList.add(new ArrayList<Map<String, String>>());
+		for(Map<String, String> m : qclist){
+			String bcType = m.get("bcType");
+			if(bcType.equals("normal")){
+				mapList.get(0).add(m);
+			} else {
+				mapList.get(1).add(m);
 			}
 		}
-		xxfcsj +=qclist.get(qclist.size()-1).get("fcsj").toString();
-		qcMap.put("xxsj", xxfcsj);
-		qcMap.put("xxbc", qclist.size()-num);
-		list.add(qcMap);
-		
-		//查询区间
-		String sqlqj="select t.*,x.station_name as qdz_name from ( "
-				+ "(SELECT fcsj,qdz,'1' as gf,xl_dir FROM bsth_c_s_ttinfo_detail  "
-				+ "where ttinfo ='"+ttinfo+"' and bc_type='region' and fcsj >='06:31'"
-				+ "and fcsj <'08:30')"
-				+ " union ( SELECT fcsj,qdz,'2' as gf,xl_dir FROM bsth_c_s_ttinfo_detail  "
-				+ "where ttinfo ='"+ttinfo+"' and bc_type='region' "
-				+ "and fcsj > '16:01' and fcsj < '18:00') order by  xl_dir,gf,fcsj ) t "
-				+ "left join bsth_c_station  x on t.qdz=x.id";
-		
-		List<Map<String, String>> qjlist= jdbcTemplate.query(sqlqj,
-				 new RowMapper<Map<String, String>>(){
-			 @Override
-			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, String> m=new HashMap<String,String>();
-				 m.put("qdz_name", rs.getString("qdz_name"));
-				 m.put("fcsj", rs.getString("fcsj"));
-				 m.put("xl", rs.getString("xl_dir"));
-				 m.put("gf", rs.getString("gf"));
-				 return m;
-			 }
-		});
-		
-		Map<String, Object> qjzMap=new HashMap<String,Object>();
-		Map<String, Object> qjwMap=new HashMap<String,Object>();
-		int numqj=0;
-		String sxfcsjqj="";
-		String xxfcsjqj="";
-		String sxzdqj="";
-		String xxzdqj="";
-		for(int i=0;i<qjlist.size();i++){
-			Map<String, String> map=qjlist.get(i);
-			if(map.get("xl").toString().equals("0")){
-				if(map.get("gf").toString().equals("1")){
-					if(sxzdqj.equals("")){
-						sxzdqj =map.get("qdz_name").toString();
-						qjzMap.put("sxzm", sxzdqj);
-						sxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()-1){
-						if(!(qjlist.get(i+1).get("gf").equals("1"))){
-							sxfcsjqj +=map.get("fcsj").toString();
-							qjzMap.put("sxsj",sxfcsjqj);
-							qjzMap.put("sxbc", i+1);
-							numqj=i+1;
-							sxzdqj ="";
-							sxfcsjqj="";
-						}
-					}else{
-						qjzMap.put("sxsj",sxfcsjqj+"-"+map.get("fcsj").toString());
-						qjzMap.put("sxbc", i+1);
-						numqj=i+1;
-						sxzdqj ="";
-						sxfcsjqj="";
-					}
-				}
-				if(map.get("gf").toString().equals("2")){
-					if(sxzdqj.equals("")){
-						sxzdqj =map.get("qdz_name").toString();
-						qjwMap.put("sxzm", sxzdqj);
-						sxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()-1){
-						if(!(qjlist.get(i+1).get("xl").equals("0"))){
-							sxfcsjqj +=map.get("fcsj").toString();
-							qjwMap.put("sxsj",sxfcsjqj);
-							qjwMap.put("sxbc", i+1-numqj);
-							numqj=i+1;
-						}
-					}else{
-						qjwMap.put("sxsj",sxfcsjqj+"-"+map.get("fcsj").toString());
-						qjwMap.put("sxbc", i+1-numqj);
-						numqj=i+1;
-					}
-				}
-				
-			}else{
-				if(map.get("gf").toString().equals("1")){
-					if(xxzdqj.equals("")){
-						xxzdqj =map.get("qdz_name").toString();
-						qjzMap.put("xxzm", xxzdqj);
-						xxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()-1){
-						if(!(qjlist.get(i+1).get("gf").equals("1"))){
-							xxfcsjqj +=map.get("fcsj").toString();
-							qjzMap.put("xxsj",xxfcsjqj);
-							qjzMap.put("xxbc", i+1-numqj);
-							numqj=i+1;
-							xxzdqj ="";
-							xxfcsjqj="";
-						}
-					}else{
-						qjzMap.put("xxsj",xxfcsjqj+"-"+map.get("fcsj").toString());
-						qjzMap.put("xxbc", i+1-numqj);
-						numqj=i+1;
-						xxzdqj ="";
-						xxfcsjqj="";
-					}
-				}
-				if(map.get("gf").toString().equals("2")){
-					if(xxzdqj.equals("")){
-						xxzdqj =map.get("qdz_name").toString();
-						qjwMap.put("xxzm", xxzdqj);
-						xxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()){
-						if(i==qjlist.size()-1){
-							xxfcsjqj +=map.get("fcsj").toString();
-							qjwMap.put("xxsj",xxfcsjqj);
-							qjwMap.put("xxbc", i+1-numqj);
-							numqj=i+1;
-						}
-					}else{
-						qjwMap.put("xxsj",xxfcsjqj+"-"+xxfcsjqj);
-						qjwMap.put("xxbc", i+1-numqj);
-						numqj=i+1;
-					}
+		for(int i = 0; i < mapList.size(); i++){
+			List<Map<String, String>> l = mapList.get(i);
+			Map<String, Object> tempMap = new HashMap<String, Object>();
+			List<String> upfcsj = new ArrayList<String>();
+			List<String> downfcsj = new ArrayList<String>();
+			String sxqdz = "", xxqdz = "";
+			String sxfcsj = "", xxfcsj = "";
+			int sxbc = 0, xxbc = 0;
+			for(Map<String, String> m : l){
+				if(m.get("xl").equals("0")){
+					sxbc++;
+					upfcsj.add(m.get("fcsj"));
+					if(sxqdz.length() == 0 && m.containsKey("qdz_name"))
+						sxqdz = m.get("qdz_name");
+				} else {
+					xxbc++;
+					downfcsj.add(m.get("fcsj"));
+					if(xxqdz.length() == 0 && m.containsKey("qdz_name"))
+						xxqdz = m.get("qdz_name");
 				}
-				
-			
 			}
+			if(upfcsj.size() != 0)
+				sxfcsj = upfcsj.get(0) + "-" + upfcsj.get(upfcsj.size() - 1);
+			if(downfcsj.size() != 0)
+				xxfcsj = downfcsj.get(0) + "-" + downfcsj.get(downfcsj.size() - 1);
+			tempMap.put("sxqdz", sxqdz);
+			tempMap.put("sxfcsj", i==0?sxfcsj:"");
+			tempMap.put("sxbc", sxbc!=0?sxbc:"");
+			tempMap.put("xxqdz", xxqdz);
+			tempMap.put("xxfcsj", i==0?xxfcsj:"");
+			tempMap.put("xxbc", xxbc!=0?xxbc:"");
+			tempMap.put("bcType", i);
+			if(sxqdz.length()!=0 || xxqdz.length()!=0)
+				list.add(tempMap);
 		}
-		if(!qjzMap.isEmpty()){
-			list.add(qjzMap);
-		}
-		if(!qjwMap.isEmpty()){
-			list.add(qjwMap);
-
-		}
 		return list;
 	}
 	@Override
@@ -769,15 +655,14 @@ public class ReportServiceImpl implements ReportService{
 				String[] minSjs = minfcsj.split(":");
 				int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
 				//查询时间里程
-				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,2 as xh FROM "
+				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
-						+ " fcsj <='"+minfcsj+"' and  bc_type = 'normal') "
+						+ " fcsj <='"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
 						+ " union "
-						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,1 as xh FROM "
+						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
-						+ " fcsj >'"+minfcsj+"' and  bc_type ='normal') "
+						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
 						+ " order by xl_dir,  xh,fcsj";
-						
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 						 new RowMapper<Map<String, Object>>(){
@@ -790,9 +675,10 @@ public class ReportServiceImpl implements ReportService{
 						 m.put("bcType", rs.getString("bc_type"));
 						 m.put("lp", rs.getString("lp"));
 						 m.put("dir", rs.getString("xl_dir"));
+						 m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"");
 						 return m;
 					 }
-				});		
+				});
 		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();
 		Map<String, List<Map<String, Object>>> keyMap = new HashMap<String, List<Map<String, Object>>>();
@@ -824,8 +710,9 @@ public class ReportServiceImpl implements ReportService{
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
-			int sxsj = 0, xxsj = 0, zcj = 0;
+			int sxsj = 0, xxsj = 0, zcj = 0, tssj = 0;
 			int temp = 24*60+1;
+			boolean ists = false;
 			for(Map<String, Object> m : list2){
 				String[] split = m.get("fcsj").toString().split(":");
 				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
@@ -838,9 +725,18 @@ public class ReportServiceImpl implements ReportService{
 				}
 				if(temp >= fcsj){
 					temp = fcsj;
+					ists = false;
 				} else {
-					cjs.add(fcsj - temp);
+					if(ists){
+						tssj += fcsj - temp;
+						ists = false;
+					} else {
+						cjs.add(fcsj - temp);
+					}
 					temp = fcsj;
+					if(m.get("ists").equals("1")){
+						ists = true;
+					}
 				}
 			}
 			Collections.sort(cjs);
@@ -852,7 +748,8 @@ public class ReportServiceImpl implements ReportService{
 			tempMap.put("xxsj", xxsj);
 			tempMap.put("fqsj", sxsj + xxsj);
 			tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
-			tempMap.put("pjcj", cjs.size()>0?zcj/(cjs.size()-1):"/");
+			tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
+			tempMap.put("tssj", tssj);
 			maps.put(key, tempMap);
 		}
 		newList.add(maps.get("(首)——6:30"));
@@ -45,7 +45,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -165,18 +165,19 @@
 							<div class="col-md-6" >
 								<table  class="table table-bordered table-checkable" id="formsTime5">
 									<tr>
-										<td colspan="6">全日分组行驶时间(区间除外)</td>
+										<td colspan="7">全日分组行驶时间(区间除外)</td>
 									</tr>
 									<tr>
 										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
-										<td width="25%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
-										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈   时间</td>
-										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
+										<td width="23%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
+										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈时间</td>
+										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">停驶时间</td>
+										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
+										<td width="12%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
 									</tr>
 									<tr>
 										<td>上行</td>
-										<td>下行</td>
+										<td style="text-align:center;">下行</td>
 									</tr>
 									<tbody class="tbody_time_5">
@@ -313,8 +314,8 @@
 				});
 				$.get('/report/tbodyTime4',{line:line,ttinfo:ttinfo},function(result){
-					$("#skb_sxzd").html(result[0].sxzm);
-					$("#skb_xxzd").html(result[0].xxzm);
+					$("#skb_sxzd").html(result[0].sxqdz);
+					$("#skb_xxzd").html(result[0].xxqdz);
 					var tbodyTime4 = template('tbodyTime4',{list:result});
 					$('#formsTime4 .tbody_time_4').html(tbodyTime4);
 				});
@@ -377,11 +378,11 @@
 {{each list as result i}}
 	<tr>
-		<td align="center">{{result.sxzm}}</td>
-		<td align="center">{{result.sxsj}}</td>
+		<td align="center">{{result.sxqdz}}</td>
+		<td align="center">{{result.sxfcsj}}</td>
 		<td align="center">{{result.sxbc}}</td>
-		<td align="center">{{result.xxzm}}</td>
-		<td align="center">{{result.xxsj}}</td>
+		<td align="center">{{result.xxqdz}}</td>
+		<td align="center">{{result.xxfcsj}}</td>
         <td align="center">{{result.xxbc}}</td>
 	</tr>
 {{/each}}
@@ -399,13 +400,14 @@
 		<td align="center">{{result.sxsj}}</td>
 		<td align="center">{{result.xxsj}}</td>
 		<td align="center">{{result.fqsj}}</td>
+		<td align="center">{{result.tssj}}</td>
 		<td align="center">{{result.cjqj}}</td>
 		<td align="center">{{result.pjcj}}</td>
 	</tr>
 {{/each}}
 {{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>