人员配置接口中间添加有售票员的线路其配驾驶员数、配售票员数、配车辆数

娄高锋
1 parent 815bcf48
Showing 1 changed file with 83 additions and 30 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -352,7 +352,7 @@ public class BigscreenService {
 		    		if(gpSet.contains(t.get("lineCode").toString())){
 		    			Map<String, Object> gp = new HashMap<String, Object>();
-			    		gp.put("type", "起讫站发车准点详情");
+			    		gp.put("type", "挂牌线路发车准点详情");
 			    		gp.put("lineName", t.get("lineName").toString());
 			    		gp.put("jh", t.get("jhszfcs").toString());
 			    		gp.put("sj", t.get("sjszfczds").toString());
@@ -410,7 +410,6 @@ public class BigscreenService {
     	dd1.setTime(dd.getTime() - 1l*1000*60*60*24);
     	String date1 = sd.format(dd1);	//前一天
     	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date1);
-    	List<ScheduleRealInfo> list_jh = new ArrayList<ScheduleRealInfo>();
     	List<ScheduleRealInfo> list_sj = new ArrayList<ScheduleRealInfo>();
     	for(ScheduleRealInfo s : findAll){
     		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
@@ -424,25 +423,25 @@ public class BigscreenService {
                 }
     		}
     	}
-    	double jhyygl = culateJhgl(list_jh);//计划营运公里
+    	double jhyygl = culateJhgl(findAll);//计划营运公里
     	double sjgl = culateSjgl(list_sj);//实际公里
     	double sjljgl = culateLjgl(list_sj);//实际临加公里
     	double sjyygl = Arith.add(sjgl, sjljgl);//实际营运公里
-    	double lz = culateCJLC(list_jh, "路阻");
-    	double dm = culateCJLC(list_jh, "吊慢");
-    	double gz = culateCJLC(list_jh, "故障");
-    	double jf = culateCJLC(list_jh, "纠纷");
-    	double zs = culateCJLC(list_jh, "肇事");
-    	double qr = culateCJLC(list_jh, "缺人");
-    	double qc = culateCJLC(list_jh, "缺车");
+    	double lz = culateCJLC(list_sj, "路阻");
+    	double dm = culateCJLC(list_sj, "吊慢");
+    	double gz = culateCJLC(list_sj, "故障");
+    	double jf = culateCJLC(list_sj, "纠纷");
+    	double zs = culateCJLC(list_sj, "肇事");
+    	double qr = culateCJLC(list_sj, "缺人");
+    	double qc = culateCJLC(list_sj, "缺车");
     	double qrqc = Arith.add(qr, qc);//缺人缺车
-    	double kx = culateCJLC(list_jh, "客稀");
-    	double qh = culateCJLC(list_jh, "气候");
-    	double yw = culateCJLC(list_jh, "援外");
-    	double lb_pc = culateCJLC(list_jh, "配车");
-    	double lb_by = culateCJLC(list_jh, "保养");
-    	double lb_cj = culateCJLC(list_jh, "抽减");
-    	double lb_qt = culateCJLC(list_jh, "其他");
+    	double kx = culateCJLC(list_sj, "客稀");
+    	double qh = culateCJLC(list_sj, "气候");
+    	double yw = culateCJLC(list_sj, "援外");
+    	double lb_pc = culateCJLC(list_sj, "配车");
+    	double lb_by = culateCJLC(list_sj, "保养");
+    	double lb_cj = culateCJLC(list_sj, "抽减");
+    	double lb_qt = culateCJLC(list_sj, "其他");
     	double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他
     	Map<String, Object> jhyyglMap = new HashMap<String, Object>();
@@ -548,9 +547,9 @@ public class BigscreenService {
     	String lineSql="SELECT b.start_opt,a.company,a.line_code,a.name,a.level,"
     			+ " a.shanghai_linecode, a.nature from "
     			+ " bsth_c_line a left join bsth_c_line_config b "
-    			+ " on a.id=b.line where "
-    			+ " a.shanghai_linecode is not null and a.shanghai_linecode !='' and a.destroy=0 "
-    			+ " and a.remove=0 and a.nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    			+ " on a.id=b.line where  a.shanghai_linecode is not null"
+    			+ " and a.shanghai_linecode !='' and a.destroy=0 and a.remove=0"
+    			+ " and a.nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
     	List<Map<String, Object>> lineList=jdbcTemplate.query(lineSql,
 				new RowMapper<Map<String, Object>>(){
 					@Override
@@ -662,10 +661,10 @@ public class BigscreenService {
     			+ " where e.is_cancel = 0 group by e.jsy, e.xl ) a"
     			+ " left join bsth_c_personnel p on a.jsy = p.id"
     			+ " group by p.company_code";
-    	List<Map<String, Object>> jsyList=jdbcTemplate.query(gpLineSql,
+    	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql,
 				new RowMapper<Map<String, Object>>(){
 					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m=new HashMap<String,Object>();
 						m.put("company", rs.getString("company_code"));
 						m.put("jsy", rs.getString("jsy"));
@@ -674,24 +673,78 @@ public class BigscreenService {
 					}
 				});
-    	for(Map<String, Object> m : jsyList){
+    	List<Map<String, Object>> jsyList = new ArrayList<Map<String, Object>>();
+    	Map<String, Object> ygMap = new HashMap<String, Object>();
+    	ygMap.put("company", "杨高");
+    	ygMap.put("jsy", "0");
+    	ygMap.put("line", "0");
+    	Map<String, Object> snMap = new HashMap<String, Object>();
+    	snMap.put("company", "上南");
+    	snMap.put("jsy", "0");
+    	snMap.put("line", "0");
+    	Map<String, Object> jgMap = new HashMap<String, Object>();
+    	jgMap.put("company", "金高");
+    	jgMap.put("jsy", "0");
+    	jgMap.put("line", "0");
+    	Map<String, Object> nhMap = new HashMap<String, Object>();
+    	nhMap.put("company", "南汇");
+    	nhMap.put("jsy", "0");
+    	nhMap.put("line", "0");
+    	for(Map<String, Object> m : ecList){		//顺序：杨高，上南，金高，南汇
+    		if("05".equals(m.get("company").toString())){
+//    			m.put("company", "杨高");
+    			ygMap.put("jsy", m.get("jsy").toString());
+    			ygMap.put("line", m.get("line").toString());
+    		}
     		if("55".equals(m.get("company").toString())){
-    			m.put("company", "上南");
+//    			m.put("company", "上南");
+    			snMap.put("jsy", m.get("jsy").toString());
+    			snMap.put("line", m.get("line").toString());
     		}
     		if("22".equals(m.get("company").toString())){
-    			m.put("company", "金高");
-    		}
-    		if("05".equals(m.get("company").toString())){
-    			m.put("company", "杨高");
+//    			m.put("company", "金高");
+    			jgMap.put("jsy", m.get("jsy").toString());
+    			jgMap.put("line", m.get("line").toString());
     		}
     		if("26".equals(m.get("company").toString())){
-    			m.put("company", "南汇");
+//    			m.put("company", "南汇");
+    			nhMap.put("jsy", m.get("jsy").toString());
+    			nhMap.put("line", m.get("line").toString());
     		}
     	}
+    	jsyList.add(ygMap);
+    	jsyList.add(snMap);
+    	jsyList.add(jgMap);
+    	jsyList.add(nhMap);
+    	
+    	String xlSql = "select (select name from bsth_c_line l where l.id = t.xl) line_name, a.jsy, b.spy, c.cl"
+    				+ " from (select xl from bsth_c_s_ecinfo e where e.spy is not null and e.is_cancel = 0 group by xl) t"
+    				+ " left join "
+    				+ " (select a.xl, count(1) jsy from (select a.xl, a.jsy from bsth_c_s_ecinfo a where a.is_cancel = 0 and a.jsy is not null group by xl, jsy) a group by xl) a"
+    				+ " on t.xl = a.xl"
+    				+ " left join" 
+    				+ " (select b.xl, count(1) spy from (select b.xl, b.spy from bsth_c_s_ecinfo b where b.is_cancel = 0 and b.spy is not null group by xl, spy) b group by xl) b"
+    				+ " on t.xl = b.xl"
+    				+ " left join"
+    				+ " (select c.xl, count(1) cl from (select c.xl, c.cl from bsth_c_s_ccinfo c where c.is_cancel = 0 and c.cl is not null and c.qyrq < now() group by xl, cl) c group by xl) c"
+    				+ " on t.xl = c.xl";
+    	List<Map<String, Object>> xlConfigList=jdbcTemplate.query(xlSql,
+				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("lineName", rs.getString("line_name"));
+						m.put("jsy", rs.getString("jsy"));
+						m.put("spy", rs.getString("spy"));
+						m.put("cl", rs.getString("cl"));
+						return m;
+					}
+				});
     	resMap.put("jsyList", jsyList);
     	resMap.put("attList", attList);
     	resMap.put("lackList", lackList);
+    	resMap.put("configList", xlConfigList);
     	return JSON.parseObject(JSON.toJSONString(resMap));
     }
@@ -703,7 +756,7 @@ public class BigscreenService {
     		Map<String, Object> tempMap = new HashMap<String, Object>();
     		tempMap.put("type", type);
     		String[] split = dates[i].split("-");
-    		tempMap.put("type", split[1] + "/" + split[2]);
+    		tempMap.put("date", split[1] + "/" + split[2]);
     		tempMap.put("jh", "0");
     		tempMap.put("sj", "0");
     		mapList.add(tempMap);