以临港的组织架构修改接口

娄高锋
1 parent 9eb97567
Showing 4 changed files with 226 additions and 176 deletions
src/main/java/com/bsth/common/BusinessCodeData.java
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
src/main/resources/application-prod.properties
@@ -14,7 +14,7 @@ import java.util.Set;
 @Component
 public class BusinessCodeData {
-    private static String str = "{\"22\": {\"name\": \"金高公司\",\"fgs\": {\"1\": \"四分公司\",\"2\": \"二分公司\",\"3\": \"三分公司\",\"5\": \"一分公司\"}},\"26\": {\"name\": \"南汇公司\",\"fgs\": {\"1\": \"南汇一分\",\"2\": \"南汇二分\",\"3\": \"南汇三分\",\"4\": \"南汇维修公司\",\"5\": \"南汇公司\"}},\"55\": {\"name\": \"上南公司\",\"fgs\": {\"1\": \"上南二分公司\",\"2\": \"上南三分公司\",\"3\": \"上南六分公司\",\"4\": \"上南一分公司\"}},\"05\": {\"name\": \"杨高公司\",\"fgs\": {\"1\": \"川沙分公司\",\"2\": \"金桥分公司\",\"3\": \"芦潮港分公司\",\"5\": \"杨高分公司\",\"6\": \"周浦分公司\"}},\"24\":{\"name\": \"嘉定公交\",\"fgs\": {\"1\": \"一车队\",\"2\": \"二车队\",\"3\": \"三车队\"}},\"77\": {\"name\":  \"闵行公司\",\"fgs\": {\"78\": \"闵行公司\"}},\"99\": {\"name\": \"青浦公交\",\"fgs\": {\"100\": \"青浦公交\"}}}";
+    private static String str = "{\"77\": {\"name\": \"临港公交\",\"fgs\": {\"1\": \"一车队\",\"2\": \"二车队\",\"3\": \"三车队\",\"5\": \"五车队\",\"6\": \"六车队\"}}}";
     static JSONObject data;
     /**
@@ -99,6 +99,8 @@ public class BigdataService {
     		name="南汇公司";
     	}else if("55".equals(gs)){
     		name="上南公司";
+    	}else if("77".equals(gs)){
+    		name="临港公交";
     	}else{
     		name="";
     	}
@@ -99,6 +99,8 @@ public class BigscreenService {
     		name="南汇公司";
     	}else if("55".equals(gs)){
     		name="上南公司";
+    	}else if("77".equals(gs)){
+    		name="临港公交";
     	}else{
     		name="";
     	}
@@ -139,8 +141,8 @@ public class BigscreenService {
     public Map<String, Long> getEndtime(String date){
     	Map<String, Long> map=new HashMap<String,Long>();
     	String sql="select xl,endtime from bsth_c_calc_count "
-    			+ " where   date='"+date+"' ";
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			+ " where date = ? ";
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date},
 				new RowMapper<Map<String, Object>>(){
 			@Override
 			public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -1345,57 +1347,61 @@ public class BigscreenService {
         	attList.add(att);
     	}
-    	String gpLineSql = "select p.company_code, count(1) jsy"
+    	String gpLineSql = "select p.company_code, branche_company_code, count(1) jsy"
     			+ " from (select e.jsy from bsth_c_s_ecinfo e"
     			+ " where e.is_cancel = 0 group by e.jsy) a"
     			+ " left join bsth_c_personnel p on a.jsy = p.id"
-    			+ " group by p.company_code";
+    			+ " group by p.company_code, branche_company_code";
     	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 {
 						Map<String, Object> m=new HashMap<String,Object>();
 						m.put("company", rs.getString("company_code"));
+						m.put("brancheCompany", rs.getString("branche_company_code"));
 						m.put("jsy", rs.getString("jsy"));
 						return m;
 					}
 				});
     	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");
-    	Map<String, Object> snMap = new HashMap<String, Object>();
-    	snMap.put("company", "上南");
-    	snMap.put("jsy", "0");
-    	Map<String, Object> jgMap = new HashMap<String, Object>();
-    	jgMap.put("company", "金高");
-    	jgMap.put("jsy", "0");
-    	Map<String, Object> nhMap = new HashMap<String, Object>();
-    	nhMap.put("company", "南汇");
-    	nhMap.put("jsy", "0");
-    	for(Map<String, Object> m : ecList){		//顺序：杨高，上南，金高，南汇
-    		if("05".equals(m.get("company").toString())){
-//    			m.put("company", "杨高");
-    			ygMap.put("jsy", m.get("jsy").toString());
+    	Map<String, Object> Map1 = new HashMap<String, Object>();
+    	Map1.put("company", "一车队");
+    	Map1.put("jsy", "0");
+    	Map<String, Object> Map2 = new HashMap<String, Object>();
+    	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("55".equals(m.get("company").toString())){
-//    			m.put("company", "上南");
-    			snMap.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("22".equals(m.get("company").toString())){
-//    			m.put("company", "金高");
-    			jgMap.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("26".equals(m.get("company").toString())){
-//    			m.put("company", "南汇");
-    			nhMap.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());
     		}
     	}
-    	jsyList.add(ygMap);
-    	jsyList.add(snMap);
-    	jsyList.add(jgMap);
-    	jsyList.add(nhMap);
+    	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"
@@ -1494,7 +1500,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(gsdm)){//直属公司
+        		if(s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//直属公司
 	        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 	        			if(!isInOut(s)){
 		        			Set<ChildTaskPlan> cts = s.getcTasks();
@@ -1522,7 +1528,7 @@ public class BigscreenService {
         	for(ScheduleRealInfo s : findAll){
         		try {
-	        		if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司
+	        		if(s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//直属公司
 		        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 			        		if (s.isSflj() || isInOut(s)){
 			                    continue;
@@ -1565,6 +1571,7 @@ public class BigscreenService {
 							else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){
 			                	Map<String, Object> m = new HashMap<String, Object>();
 			        			m.put("gsName", s.getGsName());
+			        			m.put("fgsName",s.getFgsName());
 			        			m.put("lineName", s.getXlName());
 			        			m.put("driverName", s.getjName());
 			        			m.put("date", s.getRealExecDate());
@@ -1596,7 +1603,8 @@ 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 = ?"
+    			+ " where p.company_code = '77'"
+				+ " where p.branche_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},
@@ -1632,18 +1640,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 = ?"
+					+ " and p.company_code = '77' and p.branche_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 = ?"
+					+ " and b.spy is not null"
+					+ " and p.company_code = '77' and p.branche_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 = ?"
+					+ " and c.cl is not null"
+					+ " and car.business_code = '77' and car.branche_company_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";
@@ -1846,7 +1856,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){
@@ -1897,9 +1907,10 @@ public class BigscreenService {
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
     			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
     			+ " from bsth_c_calc_count "
-    			+ " where gsdm = '"+gsdm+"' and date like '%"+month+"%'";
+    			+ " where gsdm = '77' and fgsdm = ?"
+    			+ " and date like ?";
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{gsdm, "%" + month + "%"},
 				new RowMapper<Map<String, Object>>(){
 					@Override
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2011,7 +2022,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){
@@ -2072,25 +2083,27 @@ public class BigscreenService {
     	final Map<String, String> gsMap = new HashMap<String, String>();
     	for(Map<String, Object> t : gsList){
     		if(t.get("code") != null && t.get("name") != null){
-    			gsMap.put(t.get("code").toString(), t.get("name").toString().substring(0, 2));
+    			gsMap.put(t.get("code").toString(), t.get("name").toString());
     		}
     	}
-    	String sql="select gsdm,xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    	String sql="select gsdm,fgsdm,xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,"
+    			+ " jhcc,sjcc,ccl,jhccz,jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
     			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
     			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
     			+ " from bsth_c_calc_count "
-    			+ " where date = '"+date+"'";
+    			+ " where date = ?";
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date},
 				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("gsdm",rs.getString("gsdm")!=null?rs.getString("gsdm"):"");
 						m.put("gs",rs.getString("gsdm")!=null?gsMap.get(rs.getString("gsdm")):"");
+						m.put("fgs",rs.getString("fgsdm")!=null?gsMap.get(rs.getString("fgsdm")):"");
 						m.put("lineCode",rs.getString("xl"));
 						m.put("lineName", rs.getString("xl_name"));
 						m.put("date",  rs.getString("date"));
@@ -2142,32 +2155,54 @@ 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);
-    	Map<String, Object> ygMap = new HashMap<String, Object>();
-    	ygMap.put("gs", "杨高");
-    	resList.add(ygMap);
-    	Map<String, Object> snMap = new HashMap<String, Object>();
-    	snMap.put("gs", "上南");
-    	resList.add(snMap);
-    	Map<String, Object> jgMap = new HashMap<String, Object>();
-    	jgMap.put("gs", "金高");
-    	resList.add(jgMap);
-    	Map<String, Object> nhMap = new HashMap<String, Object>();
-    	nhMap.put("gs", "南汇");
-    	resList.add(nhMap);
-    	Map<String, Object> pjMap = new HashMap<String, Object>();
-    	pjMap.put("gs", "浦交");
-    	resList.add(pjMap);
+    	sortMap.put("一车队", 0);
+    	sortMap.put("二车队", 1);
+    	sortMap.put("三车队", 2);
+    	sortMap.put("五车队", 3);
+    	sortMap.put("六车队", 4);
+    	sortMap.put("临港公交", 5);
+    	Map<String, Object> Map1 = new HashMap<String, Object>();
+    	Map1.put("gs", "一车队");
+    	resList.add(Map1);
+    	Map<String, Object> Map2 = new HashMap<String, Object>();
+    	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", "临港公交");
+    	resList.add(lgMap);
+    	
+    	for(Map<String, Object> m : resList){
+    		mapPut(m, "jhcc", 0);
+			mapPut(m, "sjcc", 0);
+			mapPut(m, "jhbc", 0);
+			mapPut(m, "sjbc", 0);
+			mapPut(m, "jhsmbc", 0);
+			mapPut(m, "sjsmbc", 0);
+			mapPut(m, "jhqqbc", 0);
+			mapPut(m, "sjqqzd", 0);
+			mapPut(m, "jhgpqqbc", 0);
+			mapPut(m, "sjgpqqzd", 0);
+			mapPut(m, "jhzgl", 0);
+			mapPut(m, "sjzgl", 0);
+			mapPut(m, "bcs", 0);
+			mapPut(m, "qks", 0);
+    	}
     	for(Map<String, Object> t : list){
-    		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")));
+    		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")));
     				mapPut(m, "jhcc", t.get("jhccz").toString());
     				mapPut(m, "sjcc", t.get("sjcc").toString());
     				mapPut(m, "jhbc", t.get("jhbc").toString());
@@ -2184,20 +2219,20 @@ public class BigscreenService {
     				mapPut(m, "sjzgl", t.get("sjzgl").toString());
     			}
-				mapPut(pjMap, "jhcc", t.get("jhccz").toString());
-				mapPut(pjMap, "sjcc", t.get("sjcc").toString());
-				mapPut(pjMap, "jhbc", t.get("jhbc").toString());
-				mapPut(pjMap, "sjbc", t.get("sjbc").toString());
-				mapPut(pjMap, "jhsmbc", t.get("jhsmbcs").toString());
-				mapPut(pjMap, "sjsmbc", t.get("sjsmbczds").toString());
-				mapPut(pjMap, "jhqqbc", t.get("jhszfcs").toString());
-				mapPut(pjMap, "sjqqzd", t.get("sjszfczds").toString());
+				mapPut(lgMap, "jhcc", t.get("jhccz").toString());
+				mapPut(lgMap, "sjcc", t.get("sjcc").toString());
+				mapPut(lgMap, "jhbc", t.get("jhbc").toString());
+				mapPut(lgMap, "sjbc", t.get("sjbc").toString());
+				mapPut(lgMap, "jhsmbc", t.get("jhsmbcs").toString());
+				mapPut(lgMap, "sjsmbc", t.get("sjsmbczds").toString());
+				mapPut(lgMap, "jhqqbc", t.get("jhszfcs").toString());
+				mapPut(lgMap, "sjqqzd", t.get("sjszfczds").toString());
 				if(gpSet.contains(t.get("lineCode").toString())){
-    				mapPut(pjMap, "jhgpqqbc", t.get("jhszfcs").toString());
-    				mapPut(pjMap, "sjgpqqzd", t.get("sjszfczds").toString());
+    				mapPut(lgMap, "jhgpqqbc", t.get("jhszfcs").toString());
+    				mapPut(lgMap, "sjgpqqzd", t.get("sjszfczds").toString());
 				}
-				mapPut(pjMap, "jhzgl", t.get("jhzgl").toString());
-				mapPut(pjMap, "sjzgl", t.get("sjzgl").toString());
+				mapPut(lgMap, "jhzgl", t.get("jhzgl").toString());
+				mapPut(lgMap, "sjzgl", t.get("sjzgl").toString());
     		}
     	}
@@ -2206,10 +2241,11 @@ 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())){//营运线路
+			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())//营运线路
+					&& "77".equals(s.getGsBm())){
 				if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
-					if(s.getGsBm()!=null && sortMap.get(gsMap.get(s.getGsBm()!=null?s.getGsBm():"")) != null){
-						Map<String, Object> m = resList.get(sortMap.get(gsMap.get(s.getGsBm())));
+					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())));
 						++jh;
 						mapPut(m, "bcs", 1);
 						String sty = decimalToBinary(s.getRfidState());
@@ -2222,8 +2258,8 @@ public class BigscreenService {
 				}
 			}
 		}
-		mapPut(pjMap, "bcs", jh);
-		mapPut(pjMap, "qks", sj);
+		mapPut(lgMap, "bcs", jh);
+		mapPut(lgMap, "qks", sj);
     	for(Map<String, Object> m : resList){
@@ -2373,8 +2409,8 @@ public class BigscreenService {
     		}
     	}
-    	String calcIntervalSql = "select * from bsth_c_calc_interval where date = '"+date+"' and sfyy = 1";
-    	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql,
+    	String calcIntervalSql = "select * from bsth_c_calc_interval where date = ? and sfyy = 1";
+    	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql, new Object[]{date},
 				new RowMapper<Map<String, Object>>(){
 					@Override
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2389,8 +2425,8 @@ public class BigscreenService {
 					}
 				});
-    	String calcIntervalDetailSql = "select * from bsth_c_calc_interval_detail where date = '"+date+"'";
-    	List<Map<String, Object>> calcIntervalDetailList=jdbcTemplate.query(calcIntervalDetailSql,
+    	String calcIntervalDetailSql = "select * from bsth_c_calc_interval_detail where date = ?";
+    	List<Map<String, Object>> calcIntervalDetailList=jdbcTemplate.query(calcIntervalDetailSql, new Object[]{date},
 				new RowMapper<Map<String, Object>>(){
 					@Override
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2451,13 +2487,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("88".equals(m.get("upCode").toString().trim())){
+    			if("77".equals(m.get("upCode").toString().trim())){
     				gsMap.put(m.get("code").toString(), m.get("name").toString());
     			}
     		}
     	}
-    	String[] gsS = {gsMap.get("05").toString(), gsMap.get("55").toString(), gsMap.get("22").toString(), gsMap.get("26").toString()};
+    	String[] gsS = {gsMap.get("1").toString(), gsMap.get("2").toString(), gsMap.get("3").toString(), gsMap.get("5").toString(), gsMap.get("6").toString()};
     	String[] levelS = {"A1", "A2", "A3", "B1", "B2", "B3", "C1", "C2", "D", "E"};
     	List<String> keyList = new ArrayList<String>();
     	for(String gs : gsS){
@@ -2472,8 +2508,8 @@ public class BigscreenService {
     		d.setTime(d.getTime() - l*1000*60*60*24);
     		String date1 = sdf.format(d);
-        	String calcIntervalSql = "select * from bsth_c_calc_interval where date = '"+date1+"' and sfyy = 1";
-        	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql,
+        	String calcIntervalSql = "select * from bsth_c_calc_interval where date = ? and sfyy = 1";
+        	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql, new Object[]{date1},
     				new RowMapper<Map<String, Object>>(){
     					@Override
     					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2492,13 +2528,15 @@ public class BigscreenService {
         	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
         	for(Map<String, Object> m : calcIntervalList){
-        		String gsName = gsMap.get(m.get("gsbm").toString()).toString();
+        		String gsName = "临港公交";
+        		String fgsName = gsMap.get(m.get("fgsbm").toString()).toString();
         		String level = m.get("level").toString();
-        		String key = gsName + "_" + level;
+        		String key = fgsName + "_" + level;
         		if(!(keyMap.containsKey(key))){
         			Map<String, Object> map = new HashMap<String, Object>();
         			map.put("date", date1);
         			map.put("gs", gsName);
+        			map.put("fgs", fgsName);
         			map.put("level", level);
         			map.put("djgAll", 0);
         			map.put("djgZgf", 0);
@@ -2559,9 +2597,9 @@ public class BigscreenService {
     			String minfcsj="02:00";
     	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
     	         		+ " id = ("
-    	         		+ "select max(id) from bsth_c_line_config where line ='"+ lineCode +"'"
+    	         		+ "select max(id) from bsth_c_line_config where line = ?"
     	         		+ ")";
-    	        List<String> list= jdbcTemplate.query(sqlMinYysj,
+    	        List<String> list= jdbcTemplate.query(sqlMinYysj, new Object[]{lineCode},
     					new RowMapper<String>(){
     					@Override
     					public String  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2873,58 +2911,68 @@ public class BigscreenService {
     	List<ScheduleRealInfo> notYetList = new ArrayList<ScheduleRealInfo>();
     	long sum = scheduleMap.keySet().size(), zwd = 0;//早未到数
-    	long yg_z = 0, sn_z = 0, jg_z = 0, nh_z = 0;
-    	long yg_zwd = 0, sn_zwd = 0, jg_zwd = 0, nh_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 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;
     	for(String key : scheduleMap.keySet()){
     		ScheduleRealInfo s = scheduleMap.get(key);
-    		if("05".equals(s.getGsBm())){
-    			yg_z += 1;
-			} else if("55".equals(s.getGsBm())){
-				sn_z += 1;
-			} else if("22".equals(s.getGsBm())){
-				jg_z += 1;
-			} else if("26".equals(s.getGsBm())){
-				nh_z += 1;
-			}
-    		if("缺人".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("05".equals(s.getGsBm())){
-    					yg_zwd += 1;
-    				} else if("55".equals(s.getGsBm())){
-    					sn_zwd += 1;
-    				} else if("22".equals(s.getGsBm())){
-    					jg_zwd += 1;
-    				} else if("26".equals(s.getGsBm())){
-    					nh_zwd += 1;
-    				}
-    				notYetList.add(s);
+    		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())){
+	    			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);
+	    			}
+	    		}
+			}
     	}
     	resMap.put("sum", sum);
     	resMap.put("notYet", zwd);
-    	resMap.put("sum_05", yg_z);
-    	resMap.put("notYet_05", yg_zwd);
-    	resMap.put("sum_55", sn_z);
-    	resMap.put("notYet_55", sn_zwd);
-    	resMap.put("sum_22", jg_z);
-    	resMap.put("notYet_22", jg_zwd);
-    	resMap.put("sum_26", nh_z);
-    	resMap.put("notYet_26", nh_zwd);
+    	resMap.put("sum_1", cd_1);
+    	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;
     }
-    public static void main(String[] args){
-    	
-    }
+//    public static void main(String[] args){
+//    	
+//    }
     public List<Map<String, Object>> createMap(String type, String[] dates){
     	List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-server.port=9089
-management.port= 9001
-management.address= 127.0.0.1
-
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
-#DATABASE
-spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.103/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= Aa123456
-#DATASOURCE
-spring.datasource.max-active=100
-spring.datasource.max-idle=8
-spring.datasource.min-idle=8
-spring.datasource.initial-size=3
-
-spring.datasource.test-on-borrow=true
-spring.datasource.test-on-connect=true
-spring.datasource.test-on-return=true
-spring.datasource.test-while-idle=true
-spring.datasource.validation-query=select 1
-
-#REDIS
-spring.redis.database=0
-spring.redis.host=10.10.150.103
-spring.redis.password=bsth_control_001
-spring.redis.port=28008
-
-http.control.service_data_url= http://10.10.150.103:9088/companyService
-http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
-
+server.port=9089
+management.port= 9001
+management.address= 127.0.0.1
+
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+#DATABASE
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= false
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://10.10.150.103:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= Aa123456
+#DATASOURCE
+spring.datasource.max-active=100
+spring.datasource.max-idle=8
+spring.datasource.min-idle=8
+spring.datasource.initial-size=3
+
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-connect=true
+spring.datasource.test-on-return=true
+spring.datasource.test-while-idle=true
+spring.datasource.validation-query=select 1
+
+#REDIS
+spring.redis.database=0
+spring.redis.host=10.10.150.103
+spring.redis.password=bsth_control_001
+spring.redis.port=28008
+
+http.control.service_data_url= http://10.10.150.103:9088/companyService
+http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
+
 http.gps.real.url= http://10.10.150.103:8080/transport_server/rtgps/
 \ No newline at end of file