接口公司名改成都的。

娄高锋
1 parent f3740620
Showing 1 changed file with 77 additions and 158 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -94,16 +94,12 @@ public class BigscreenService {
     private static String getGs(String gs){
     	String name="";
-    	if("05".equals(gs)){
-    		name="杨高公司";
-    	}else if("22".equals(gs)){
-    		name="金高公司";
-    	}else if("26".equals(gs)){
-    		name="南汇公司";
-    	}else if("55".equals(gs)){
-    		name="上南公司";
-    	}else if("77".equals(gs)){
-    		name="临港公交";
+    	if("100".equals(gs)){
+    		name="大邑公交";
+    	}else if("200".equals(gs)){
+    		name="蒲江公交";
+    	}else if("300".equals(gs)){
+    		name="拓华测试";
     	}else{
     		name="";
     	}
@@ -599,7 +595,7 @@ public class BigscreenService {
     }
     /**给大屏的线路数、班次、里程汇总接口
-     * 按车队查询
+     * 按公司查询
      */
     @GET
     @Path("/selectData/getBigScreen/{gsdm}")
@@ -670,8 +666,8 @@ public class BigscreenService {
     	int level1 = 0, level2 = 0, lineCount = 0;
     	for(Map<String, Object> t : lineList){
-    		if(t.containsKey("company") && t.get("company").toString().trim().equals("77") &&
-    				t.containsKey("brancheCompany") && t.get("brancheCompany").toString().trim().equals(gsdm)){
+    		if(t.containsKey("company") &&t.get("company").toString().trim().equals(gsdm)
+    				&& t.containsKey("brancheCompany")){
     			++lineCount;
 	    		if(t.get("level") != null){
 	    			if("1".equals(t.get("level").toString())){
@@ -709,7 +705,7 @@ public class BigscreenService {
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
     			+ " jhszfcs,sjszfczds,szfczdl,create_date"
     			+ " from bsth_c_calc_count "
-    			+ " where date >= ? and date <= ? and gsdm = '77' and fgsdm = ?";
+    			+ " where date >= ? and date <= ? and gsdm = ?";
     	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date2, date, gsdm},
 				new RowMapper<Map<String, Object>>(){
@@ -867,8 +863,7 @@ public class BigscreenService {
 	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
 	    		long jh = 0, sj = 0;
 	    		for(ScheduleRealInfo s : findAll){
-	    			if(s.getGsBm() != null && s.getGsBm().trim().equals("77") &&
-	    					s.getFgsBm() != null && s.getFgsBm().trim().equals(gsdm)){
+	    			if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm) && s.getFgsBm() != null){
 		    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 			    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
 			    				++jh;
@@ -925,8 +920,7 @@ public class BigscreenService {
     	List<ScheduleRealInfo> listSche = new ArrayList<ScheduleRealInfo>();
     	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
     	for(ScheduleRealInfo s : findAll){
-    		if(s.getGsBm() != null && s.getGsBm().trim().equals("77") &&
-    				s.getFgsBm() != null && s.getFgsBm().trim().equals(gsdm)){
+    		if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm) && s.getFgsBm() != null){
 	    		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 	    			listSche.add(s);
 	    			Set<ChildTaskPlan> cts = s.getcTasks();
@@ -1650,42 +1644,24 @@ public class BigscreenService {
     	List<Map<String, Object>> jsyList = new ArrayList<Map<String, Object>>();
     	Map<String, Object> Map1 = new HashMap<String, Object>();
-    	Map1.put("company", "一车队");
+    	Map1.put("company", "大邑公交");
     	Map1.put("jsy", "0");
     	Map<String, Object> Map2 = new HashMap<String, Object>();
-    	Map2.put("company", "二车队");
+    	Map2.put("company", "蒲江公交");
     	Map2.put("jsy", "0");
-    	Map<String, Object> Map3 = new HashMap<String, Object>();
-    	Map3.put("company", "三车队");
-    	Map3.put("jsy", "0");
-    	Map<String, Object> Map5 = new HashMap<String, Object>();
-    	Map5.put("company", "五车队");
-    	Map5.put("jsy", "0");
-    	Map<String, Object> Map6 = new HashMap<String, Object>();
-    	Map6.put("company", "六车队");
-    	Map6.put("jsy", "0");
-    	for(Map<String, Object> m : ecList){		//顺序：一车队-->六车队
-    		if("77".equals(m.get("company").toString()) && "1".equals(m.get("brancheCompany").toString())){
-    			Map1.put("jsy", m.get("jsy").toString());
-    		}
-    		if("77".equals(m.get("company").toString()) && "2".equals(m.get("brancheCompany").toString())){
-    			Map2.put("jsy", m.get("jsy").toString());
-    		}
-    		if("77".equals(m.get("company").toString()) && "3".equals(m.get("brancheCompany").toString())){
-    			Map3.put("jsy", m.get("jsy").toString());
-    		}
-    		if("77".equals(m.get("company").toString()) && "5".equals(m.get("brancheCompany").toString())){
-    			Map5.put("jsy", m.get("jsy").toString());
-    		}
-    		if("77".equals(m.get("company").toString()) && "6".equals(m.get("brancheCompany").toString())){
-    			Map6.put("jsy", m.get("jsy").toString());
+    	for(Map<String, Object> m : ecList){		//顺序：大邑公交、蒲江公交
+    		if(m.containsKey("company") && m.get("company") != null
+    				&& m.get("company").toString().trim().length() > 0){
+	    		if("100".equals(m.get("company").toString())){
+	    			Map1.put("jsy", m.get("jsy").toString());
+	    		}
+	    		if("200".equals(m.get("company").toString())){
+	    			Map2.put("jsy", m.get("jsy").toString());
+	    		}
     		}
     	}
     	jsyList.add(Map1);
     	jsyList.add(Map2);
-    	jsyList.add(Map3);
-    	jsyList.add(Map5);
-    	jsyList.add(Map6);
     	String xlSql = "select a.jsy, b.spy, c.cl from"
 					+ " (select count(1) jsy from (select a.jsy from bsth_c_s_ecinfo a where a.is_cancel = 0 and a.spy is not null and a.jsy is not null group by jsy) a) a"
@@ -1784,8 +1760,7 @@ public class BigscreenService {
         	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(dates[i]);
         	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
         	for(ScheduleRealInfo s : findAll){
-        		if(s.getGsBm() != null && s.getGsBm().equals("77") &&
-        				s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//车队
+        		if(s.getGsBm() != null && s.getFgsBm() != null && s.getGsBm().equals(gsdm)){//公司
 	        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 	        			if(!isInOut(s)){
 		        			Set<ChildTaskPlan> cts = s.getcTasks();
@@ -1813,8 +1788,7 @@ public class BigscreenService {
         	for(ScheduleRealInfo s : findAll){
         		try {
-	        		if(s.getGsBm() != null && s.getGsBm().equals("77") &&
-	        				s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//车队
+	        		if(s.getGsBm() != null && s.getFgsBm() != null && s.getGsBm().equals(gsdm)){//公司
 		        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 			        		if (s.isSflj() || isInOut(s)){
 			                    continue;
@@ -1889,8 +1863,7 @@ public class BigscreenService {
     			+ " left join bsth_c_personnel p on a.jsy = p.id"
     			+ " left join bsth_c_business b on p.company_code = b.up_code"
     			+ " and p.branche_company_code = b.business_code"
-    			+ " where p.company_code = '77'"
-				+ " and p.branche_company_code = ?"
+    			+ " where p.company_code = ?"
     			+ " group by p.branche_company_code, b.business_name"
     			+ " order by p.branche_company_code";
     	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql, new Object[]{gsdm},
@@ -1926,20 +1899,20 @@ public class BigscreenService {
 					+ " (select count(1) jsy from (select a.jsy from bsth_c_s_ecinfo a"
 					+ " left join bsth_c_personnel p on a.jsy=p.id where a.is_cancel = 0"
 					+ " and a.spy is not null and a.jsy is not null"
-					+ " and p.company_code = '77' and p.branche_company_code = ?"
+					+ " and p.company_code = ?"
 					+ " group by jsy) a) a"
 					+ " LEFT JOIN"
 					+ " (select count(1) spy from (select b.spy from bsth_c_s_ecinfo b"
 					+ " left join bsth_c_personnel p on b.spy=p.id where b.is_cancel = 0"
 					+ " and b.spy is not null"
-					+ " and p.company_code = '77' and p.branche_company_code = ?"
+					+ " and p.company_code = ?"
 					+ " group by spy) b) b"
 					+ " on 1=1"
 					+ " LEFT JOIN"
 					+ " (select count(1) cl from (select c.cl from bsth_c_s_ccinfo c"
 					+ " left join bsth_c_cars car on c.cl=car.id where c.is_cancel = 0"
 					+ " and c.cl is not null"
-					+ " and car.business_code = '77' and car.branche_company_code = ?"
+					+ " and car.business_code = ?"
 					+ " and c.xl in(select e.xl from bsth_c_s_ecinfo e"
 					+ " where e.is_cancel = 0 and e.spy is not null) group by c.cl) c) c"
 					+ " on 1=1";
@@ -2141,7 +2114,7 @@ public class BigscreenService {
     	return JSON.parseObject(JSON.toJSONString(resMap));
     }
-    /** 按月份查询车队统计指标 */
+    /** 按月份查询公司统计指标 */
     @GET
     @Path("/selectData/getMonthly/{gsdm}/{month}")
     public JSONObject getMonthly(@PathParam("gsdm") String gsdm, @PathParam("month") String month){
@@ -2192,7 +2165,7 @@ public class BigscreenService {
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
     			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
     			+ " from bsth_c_calc_count "
-    			+ " where gsdm = '77' and fgsdm = ?"
+    			+ " where gsdm = ?"
     			+ " and date like ?";
     	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{gsdm, "%" + month + "%"},
@@ -2306,7 +2279,7 @@ public class BigscreenService {
     	return JSON.parseObject(JSON.toJSONString(resMap));
     }
-    /** 按日期查询所有车队统计指标 */
+    /** 按日期查询所有公司统计指标 */
     @GET
     @Path("/selectData/getCompanyData/{date}")
     public List<Map<String, Object>> getCompanyData(@PathParam("date") String date){
@@ -2438,29 +2411,17 @@ public class BigscreenService {
     	Map<String, Integer> sortMap = new HashMap<String, Integer>();
-    	sortMap.put("一车队", 0);
-    	sortMap.put("二车队", 1);
-    	sortMap.put("三车队", 2);
-    	sortMap.put("五车队", 3);
-    	sortMap.put("六车队", 4);
-    	sortMap.put("临港公交", 5);
+    	sortMap.put("大邑公交", 0);
+    	sortMap.put("浦江公交", 1);
+    	sortMap.put("合计", 2);
     	Map<String, Object> Map1 = new HashMap<String, Object>();
-    	Map1.put("gs", "一车队");
+    	Map1.put("gs", "大邑公交");
     	resList.add(Map1);
     	Map<String, Object> Map2 = new HashMap<String, Object>();
-    	Map2.put("gs", "二车队");
+    	Map2.put("gs", "浦江公交");
     	resList.add(Map2);
-    	Map<String, Object> Map3 = new HashMap<String, Object>();
-    	Map3.put("gs", "三车队");
-    	resList.add(Map3);
-    	Map<String, Object> Map5 = new HashMap<String, Object>();
-    	Map5.put("gs", "五车队");
-    	resList.add(Map5);
-    	Map<String, Object> Map6 = new HashMap<String, Object>();
-    	Map6.put("gs", "六车队");
-    	resList.add(Map6);
     	Map<String, Object> lgMap = new HashMap<String, Object>();
-    	lgMap.put("gs", "临港公交");
+    	lgMap.put("gs", "合计");
     	resList.add(lgMap);
     	for(Map<String, Object> m : resList){
@@ -2482,10 +2443,9 @@ public class BigscreenService {
     	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())
-    				&& "77".equals(t.get("gsdm").toString())){
-    			if(sortMap.get(t.get("fgs")) != null){
-	    			Map<String, Object> m = resList.get(sortMap.get(t.get("fgs")));
+    		if(yyLine.contains(t.get("lineCode").toString())){
+    			if(sortMap.get(t.get("gs")) != null){
+	    			Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
     				mapPut(m, "jhcc", t.get("jhcc").toString());
     				mapPut(m, "sjcc", t.get("sjcc").toString());
     				mapPut(m, "jhbc", t.get("jhbc").toString());
@@ -2524,8 +2484,7 @@ public class BigscreenService {
 		List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
 		long jh = 0, sj = 0;
 		for(ScheduleRealInfo s : findAll){
-			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())//营运线路
-					&& "77".equals(s.getGsBm())){
+			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 				if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
 					if(s.getFgsBm()!=null && sortMap.get(gsMap.get(s.getFgsBm()!=null?s.getFgsBm():"")) != null){
 						Map<String, Object> m = resList.get(sortMap.get(gsMap.get(s.getFgsBm())));
@@ -2780,13 +2739,13 @@ public class BigscreenService {
     	for(Map<String, Object> m : gsList){
     		if(m.get("upCode") != null && m.get("upCode").toString().trim().length() > 0
     				&& !("0".equals(m.get("upCode").toString().trim()))){
-    			if("77".equals(m.get("upCode").toString().trim())){
+    			if("88".equals(m.get("upCode").toString().trim()) && !"拓华".equals(m.get("name").toString())){
     				gsMap.put(m.get("code").toString(), m.get("name").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 = {gsMap.get("100").toString(), gsMap.get("200").toString()};
     	String[] levelS = {"A1", "A2", "A3", "B1", "B2", "B3", "C1", "C2", "D", "E"};
     	List<String> keyList = new ArrayList<String>();
     	for(String gs : gsS){
@@ -2821,10 +2780,10 @@ public class BigscreenService {
         	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
         	for(Map<String, Object> m : calcIntervalList){
-        		String gsName = "临港公交";
-        		String fgsName = gsMap.get(m.get("fgsbm").toString()).toString();
+        		String gsName = gsMap.get(m.get("gsbm").toString()).toString();
+        		String fgsName = gsName;
         		String level = m.get("level").toString();
-        		String key = fgsName + "_" + level;
+        		String key = gsName + "_" + level;
         		if(!(keyMap.containsKey(key))){
         			Map<String, Object> map = new HashMap<String, Object>();
         			map.put("date", date1);
@@ -3285,46 +3244,32 @@ public class BigscreenService {
     	long sum = scheduleMap.keySet().size(), zwd = 0;//早未到数
 //    	long yg_z = 0, sn_z = 0, jg_z = 0, nh_z = 0;
-    	long cd_1 = 0, cd_2 = 0, cd_3 = 0, cd_5 = 0, cd_6 = 0;
+    	long cd_1 = 0, cd_2 = 0;
 //    	long yg_zwd = 0, sn_zwd = 0, jg_zwd = 0, nh_zwd = 0;
-    	long cd_1_zwd = 0, cd_2_zwd = 0, cd_3_zwd = 0, cd_5_zwd = 0, cd_6_zwd = 0;
+    	long cd_1_zwd = 0, cd_2_zwd = 0;
     	for(String key : scheduleMap.keySet()){
     		ScheduleRealInfo s = scheduleMap.get(key);
-    		if("77".equals(s.getGsBm())){
-    			if("1".equals(s.getFgsBm())){
-    				cd_1 += 1;
-    			} else if("2".equals(s.getFgsBm())){
-    				cd_2 += 1;
-    			} else if("3".equals(s.getFgsBm())){
-    				cd_3 += 1;
-    			} else if("5".equals(s.getFgsBm())){
-    				cd_5 += 1;
-    			} else if("6".equals(s.getFgsBm())){
-    				cd_6 += 1;
-    			}
-	    		if("缺人".equals(s.getAdjustExps()) || "缺车".equals(s.getAdjustExps())){
-	    			List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-	    			list.add(s);
-	    			BigDecimal sjgl = new BigDecimal(culateSjgl(list));
-	    			BigDecimal ljgl = new BigDecimal(culateLjgl(list));
-	    			BigDecimal zero = new BigDecimal(0.0);
-	    			if(sjgl.compareTo(zero) == 0 && ljgl.compareTo(zero) == 0){
-	    				zwd += 1;
-	    				if("1".equals(s.getFgsBm())){
-	    					cd_1_zwd += 1;
-	    				} else if("2".equals(s.getFgsBm())){
-	    					cd_2_zwd += 1;
-	    				} else if("3".equals(s.getFgsBm())){
-	    					cd_3_zwd += 1;
-	    				} else if("5".equals(s.getFgsBm())){
-	    					cd_5_zwd += 1;
-	    				} else if("6".equals(s.getFgsBm())){
-	    					cd_6_zwd += 1;
-	    				}
-	    				notYetList.add(s);
-	    			}
-	    		}
+			if("100".equals(s.getGsBm())){
+				cd_1 += 1;
+			} else if("200".equals(s.getGsBm())){
+				cd_2 += 1;
 			}
+    		if("缺人".equals(s.getAdjustExps()) || "缺车".equals(s.getAdjustExps())){
+    			List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+    			list.add(s);
+    			BigDecimal sjgl = new BigDecimal(culateSjgl(list));
+    			BigDecimal ljgl = new BigDecimal(culateLjgl(list));
+    			BigDecimal zero = new BigDecimal(0.0);
+    			if(sjgl.compareTo(zero) == 0 && ljgl.compareTo(zero) == 0){
+    				zwd += 1;
+    				if("100".equals(s.getGsBm())){
+    					cd_1_zwd += 1;
+    				} else if("200".equals(s.getGsBm())){
+    					cd_2_zwd += 1;
+    				}
+    				notYetList.add(s);
+    			}
+    		}
     	}
     	resMap.put("sum", sum);
@@ -3333,12 +3278,6 @@ public class BigscreenService {
     	resMap.put("notYet_1", cd_1_zwd);
     	resMap.put("sum_2", cd_2);
     	resMap.put("notYet_2", cd_2_zwd);
-    	resMap.put("sum_3", cd_3);
-    	resMap.put("notYet_3", cd_3_zwd);
-    	resMap.put("sum_5", cd_5);
-    	resMap.put("notYet_5", cd_5_zwd);
-    	resMap.put("sum_6", cd_6);
-    	resMap.put("notYet_6", cd_6_zwd);
     	resMap.put("notYetList", notYetList);
     	return resMap;
     }
@@ -3427,22 +3366,14 @@ public class BigscreenService {
     	List<ScheduleRealInfo> notYetList = new ArrayList<ScheduleRealInfo>();
     	long sum = scheduleMap.keySet().size(), zwd = 0;//早未到数
-    	long cd_1 = 0, cd_2 = 0, cd_3 = 0, cd_5 = 0, cd_6 = 0;
-    	long cd_1_zwd = 0, cd_2_zwd = 0, cd_3_zwd = 0, cd_5_zwd = 0, cd_6_zwd = 0;
+    	long cd_1 = 0, cd_2 = 0;
+    	long cd_1_zwd = 0, cd_2_zwd = 0;
     	for(String key : scheduleMap.keySet()){
     		ScheduleRealInfo s = scheduleMap.get(key);
-    		if("77".equals(s.getGsBm())){
-    			if("1".equals(s.getFgsBm())){
-    				cd_1 += 1;
-    			} else if("2".equals(s.getFgsBm())){
-    				cd_2 += 1;
-    			} else if("3".equals(s.getFgsBm())){
-    				cd_3 += 1;
-    			} else if("5".equals(s.getFgsBm())){
-    				cd_5 += 1;
-    			} else if("6".equals(s.getFgsBm())){
-    				cd_6 += 1;
-    			}
+			if("100".equals(s.getGsBm())){
+				cd_1 += 1;
+			} else if("200".equals(s.getGsBm())){
+				cd_2 += 1;
 			}
     	}
@@ -3460,16 +3391,10 @@ public class BigscreenService {
 	    			BigDecimal zero = new BigDecimal(0.0);
 	    			if(sjgl.compareTo(zero) == 0 && ljgl.compareTo(zero) == 0){
 	    				zwd += 1;
-	    				if("1".equals(s.getFgsBm())){
+	    				if("100".equals(s.getGsBm())){
 	    					cd_1_zwd += 1;
-	    				} else if("2".equals(s.getFgsBm())){
+	    				} else if("200".equals(s.getGsBm())){
 	    					cd_2_zwd += 1;
-	    				} else if("3".equals(s.getFgsBm())){
-	    					cd_3_zwd += 1;
-	    				} else if("5".equals(s.getFgsBm())){
-	    					cd_5_zwd += 1;
-	    				} else if("6".equals(s.getFgsBm())){
-	    					cd_6_zwd += 1;
 	    				}
 	    				notYetList.add(s);
 	    			}
@@ -3484,12 +3409,6 @@ public class BigscreenService {
     	resMap.put("notYet_1", cd_1_zwd);
     	resMap.put("sum_2", cd_2);
     	resMap.put("notYet_2", cd_2_zwd);
-    	resMap.put("sum_3", cd_3);
-    	resMap.put("notYet_3", cd_3_zwd);
-    	resMap.put("sum_5", cd_5);
-    	resMap.put("notYet_5", cd_5_zwd);
-    	resMap.put("sum_6", cd_6);
-    	resMap.put("notYet_6", cd_6_zwd);
     	resMap.put("notYetList", notYetList);
     	return resMap;
     }