251125 给谢灿大间隔数据改成全量并补充上下行、前后车自编号、驾驶员工号和姓名等字段。

娄高锋
1 parent 10c1aff0
Showing 1 changed file with 28 additions and 11 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -2886,6 +2886,13 @@ public class BigscreenService {
 						m.put("sjfc2", rs.getString("sjfc2"));
 						m.put("subTime", rs.getString("sub_time"));
 						m.put("remark", rs.getString("remark"));
+						m.put("xlDir", rs.getString("xl_dir"));
+						m.put("zbh1", rs.getString("zbh1"));
+						m.put("jGh1", rs.getString("j_gh1"));
+						m.put("jName1", rs.getString("j_name1"));
+						m.put("zbh2", rs.getString("zbh2"));
+						m.put("jGh2", rs.getString("j_gh2"));
+						m.put("jName2", rs.getString("j_name2"));
 						return m;
 					}
 				});
@@ -2903,16 +2910,17 @@ public class BigscreenService {
     			m.put("gs", gsMap.get(map.get("gsbm").toString()));
     			m.put("fgs", fgsMap.get(map.get("fgsbm").toString() + "_" + map.get("gsbm").toString()));
  
-    			if(m.containsKey("remark") && m.get("remark").toString().trim().length() > 0){
-    				
-    				if((""+m.get("jhfc1")).equals(""+m.get("sjfc1"))
-    						&& (""+m.get("jhfc2")).equals(""+m.get("sjfc2"))
-    						&& (!m.get("remark").toString().contains("中间"))){ //前后车计划实发一致且中间无烂班班次的不报出
-    					continue;
-    				}
-        			
-        			resList.add(m);
-    			}
+//    			if(m.containsKey("remark") && m.get("remark").toString().trim().length() > 0){
+//    				
+//    				if((""+m.get("jhfc1")).equals(""+m.get("sjfc1"))
+//    						&& (""+m.get("jhfc2")).equals(""+m.get("sjfc2"))
+//    						&& (!m.get("remark").toString().contains("中间"))){ //前后车计划实发一致且中间无烂班班次的不报出
+//    					continue;
+//    				}
+//        			
+//        			resList.add(m);
+//    			}
+    			resList.add(m); // 251125 给谢灿大间隔数据改成全量，上面剔除无备注或者无中间烂班车的判断他那边自己处理。
     		}
     	}
  
@@ -2947,7 +2955,14 @@ public class BigscreenService {
     		}
     	}
  
-    	String[] gsS = {gsMap.get("1").toString(), gsMap.get("2").toString(), gsMap.get("3").toString(), gsMap.get("5").toString(), gsMap.get("6").toString()};
+//    	String[] gsS = {gsMap.get("1").toString(), gsMap.get("2").toString(), gsMap.get("3").toString(), gsMap.get("5").toString(), gsMap.get("6").toString()};
+    	String[] gsS = new String[gsMap.size()];
+    	Set<String> keySet = gsMap.keySet();
+    	int i = 0;
+    	for(String s : keySet){
+    		gsS[i] = s;
+    		i++;
+    	}
     	String[] levelS = {"A1", "A2", "A3", "B1", "B2", "B3", "C1", "C2", "D", "E"};
     	List<String> keyList = new ArrayList<String>();
     	for(String gs : gsS){
@@ -2981,7 +2996,9 @@ public class BigscreenService {
     				});
  
         	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
+//        	logger.info(gsMap.toString());
         	for(Map<String, Object> m : calcIntervalList){
+//            	logger.info(m.toString());
         		String gsName = "临港公交";
         		String fgsName = gsMap.get(m.get("fgsbm").toString()).toString();
         		String level = m.get("level").toString();