大间隔统计表添加线路性质查询，详细信息查询预统计表

廖磊 · 娄高锋
1 parent 2f028ce1
Showing 7 changed files with 106 additions and 18 deletions
src/main/java/com/bsth/controller/calc/CalcIntervalController.java
src/main/java/com/bsth/service/calc/CalcIntervalService.java
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
src/main/resources/static/pages/report/sheet/intervalCount.html
src/main/resources/static/pages/report/sheet/intervalList.html
 package com.bsth.controller.calc;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +32,12 @@ public class CalcIntervalController  extends BaseController&lt;CalcInterval,Integer
 	@RequestMapping(value="/interval")
 	public List<Map<String,Object>> interval(@RequestParam Map<String, Object> map){
-		List<Map<String,Object>> list=calcIntervalService.interval(map);
+		List<Map<String,Object>> list=new ArrayList<Map<String,Object>>();
+		if(map.get("status")==null){
+			list=calcIntervalService.interval(map);
+		}else{
+			list=calcIntervalService.intervalDetail(map);
+		}
 		return list;
 	}
@@ -13,5 +13,9 @@ public interface CalcIntervalService extends BaseService&lt;CalcInterval,Integer&gt; {
 	 List<Map<String,Object>> countList(Map<String, Object> map);
 	 List<Map<String,Object>> listInterval(Map<String, Object> map);
+	 //根据排班表查询
 	 List<Map<String,Object>> interval(Map<String, Object> map);
+	 //根据预统计表查询
+	 List<Map<String,Object>> intervalDetail(Map<String, Object> map);
+
 }
@@ -31,6 +31,7 @@ import com.bsth.entity.sheet.Sheet;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.LineService;
 import com.bsth.service.calc.CalcIntervalService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.util.ComparableReal;
@@ -51,6 +52,8 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	LineRepository lineRepository;
 	@Autowired
     JdbcTemplate jdbcTemplate;
+	@Autowired
+	LineService lineService;
 	@Override
 	public List<Map<String, Object>> countList(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -62,6 +65,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		String fgs=map.get("fgs").toString().trim();
 		String sDate=map.get("date").toString();
 		String eDate=map.get("endDate").toString();
+		String nature=map.get("nature").toString();
 		//D级线路显示发车准点率
 		if(level.equals("D")){
@@ -170,16 +174,36 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			});
 		}
+		//根据线路类型确定是否营运
+		Map<String, Boolean> lineMap=lineService.lineNature();
+        List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
+        for (int i = 0; i < list.size(); i++) {
+			Map<String, Object> m=list.get(i);
+			if (nature.equals("0")) {
+				listAll.add(m);
+			}else if(nature.equals("1")){
+				if(lineMap.get(m.get("xlBm").toString())){
+					listAll.add(m);
+				}
+			}else{
+				if(!lineMap.get(m.get("xlBm").toString())){
+					listAll.add(m);
+				}
+			}
+		}
+		
 		if(map.get("type").equals("export")){
 			String lineName="";
-			if(line.equals("")){
-				if(fgs.equals("")){
-					lineName=list.get(0).get("gs").toString();
-				}else{
-					lineName=list.get(0).get("fgs").toString();
+			if(listAll.size()>0){
+				if(line.equals("")){
+					if(fgs.equals("")){
+						lineName=listAll.get(0).get("gs").toString();
+					}else{
+						lineName=listAll.get(0).get("fgs").toString();
+					}
+				}else{ 
+					lineName=listAll.get(0).get("xlName").toString();
 				}
-			}else{ 
-				lineName=list.get(0).get("xlName").toString();
 			}
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
@@ -193,7 +217,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					dateTime = sDate.replaceAll("-", "")+"-"+
 							eDate.replaceAll("-", "");
 				}
-				listI.add(list.iterator());
+				listI.add(listAll.iterator());
 				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 				String xls="";
 				String xlsName="";
@@ -216,7 +240,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				e.printStackTrace();
 			}
 		}
-		return list;
+		return listAll;
 	}
 	@Override
 	public List<Map<String, Object>> listInterval(Map<String, Object> map) {
@@ -607,6 +631,49 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		return list;
 	}
+	@Override
+	public List<Map<String, Object>> intervalDetail(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String line=map.get("line").toString();
+		String date=map.get("date").toString();
+		String sql="select * from bsth_c_calc_interval_detail where line_code='"+line+"' and "
+				+ " date ='"+date+"'";
+		
+		List<Map<String, Object>> list=jdbcTemplate.query(sql, 
+				 new RowMapper<Map<String,Object>>(){
+			 @Override 
+			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				Map<String, Object> m=new HashMap<String,Object>();
+				m.put("xlName", rs.getString("line_name"));
+				m.put("level", rs.getString("level"));
+				m.put("jhfc1", rs.getString("jhfc1"));
+				m.put("sjfc1", rs.getString("sjfc1"));
+				m.put("jhfc2", rs.getString("jhfc2"));
+				m.put("sjfc2", rs.getString("sjfc2"));
+				m.put("subTime", rs.getString("sub_time"));
+				m.put("date", rs.getString("date"));
+				m.put("station", rs.getString("station"));
+
+				 return m;
+			 }
+		});
+		if(map.get("type").toString().equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls",
+						path + "export/"+date+"大间隔详细.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
 	private Long minFcsjs(int id){
     	String minfcsj="02:00";
@@ -620,6 +687,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
     	return minSj;
     }
+	
 }
 class ComparableJhfc implements Comparator<ScheduleRealInfo>{
@@ -39,6 +39,16 @@
                     	    <span class="item-label" style="width: 80px;">线路: </span>
                             <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     	</div>
+                    	<div style="display: inline-block;margin-left: 42px;">
+						<span class="item-label" style="width: 80px;">线路性质: </span>
+						 <select
+							class="form-control" name="nature" id="nature"
+							style="width: 180px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+						</div>
 						<div style="margin-top: 10px">
                     </div>
 					<div style="display: inline-block;margin-left: 33px;">
@@ -80,7 +90,7 @@
 								<td>低谷次数</td>
 								<td>全日班次数</td>
 								<td>万班次发生率</td>
-								<td>最大间隔时间</td>
+<!-- 								<td>最大间隔时间</td> -->
 								<td>查看</td>
 							</tr>
 						</thead>
@@ -126,7 +136,6 @@
 								<td>低谷次数</td>
 								<td>全日班次数</td>
 								<td>万班次发生率</td>
-								<td>最大间隔</td>
 								<td>查看</td>
 							</tr>
 						</thead>
@@ -259,6 +268,7 @@
 					var temp = tempData[$("#line").val()].split(":");
 					$("#gsdm").val(temp[0]);
 					updateCompany();
+					$("#nature").val(0);
 					$("#fgsdm").val(temp[1]);
 					$("#gsdm").attr("disabled", true);
 					$("#fgsdm").attr("disabled", true);
@@ -275,8 +285,9 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
+			var nature=$("#nature").val();
 			var i = layer.load(2);
-		    $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,type:'query'},function(result){
+		    $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:'query'},function(result){
 			if(levelType=="D"){
 				var intervalList_d = template('intervalList_d',{list:result});
 				$('#forms_d tbody').html(intervalList_d);
@@ -396,6 +407,7 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
+			var nature=$('#nature').val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdm option:selected').text();
@@ -403,7 +415,7 @@
 				lineName = $('#gsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,type:"export",lineName:lineName},function(result){
+			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -458,7 +470,6 @@
 		<td>{{obj.djgDg}}</td>
 		<td>{{obj.bcs}}</td>
 		<td>{{obj.fsl}}</td>
-		<td>{{obj.djgTime}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList" 
 			data-id="{{obj.xlBm}}">查看</button>
@@ -512,7 +523,6 @@
 		<td>{{obj.djgDg}}</td>
 		<td>{{obj.bcs}}</td>
 		<td>{{obj.fsl}}</td>
-		<td>{{obj.djgTime}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList_1" 
 			data-id="{{obj.xlBm}}" data-date="{{obj.date}}">详细</button>
@@ -63,7 +63,7 @@
 			no=id.split(",")[0];
 			dates = id.split(",")[1];
 			var i = layer.load(2);
-			$get('/calcInterval/interval',{line:no,date:dates,type:'query'},function(result){
+			$get('/calcInterval/interval',{line:no,date:dates,status:"detail",type:'query'},function(result){
 				layer.close(i);
 				var calcIntervalList_2 = template('calcIntervalList_2',{list:result});
 				$('#forms_2 tbody').html(calcIntervalList_2);
@@ -71,7 +71,7 @@
 		})
 		$("#exportList").on('click',function(){
 			var i = layer.load(2);
-			$get('/calcInterval/interval',{line:no,date:dates,type:'export'},function(result){
+			$get('/calcInterval/interval',{line:no,date:dates,status:"detail",type:'export'},function(result){
 				window.open("/downloadFile/download?fileName="+dates+"大间隔详细");
 				layer.close(i);
 			});