签卡率计算方法调整：取执行中与已完成的班次（除烂班）数做分母，其中正常签卡数做分子

娄高锋
1 parent 66d75254
Showing 2 changed files with 124 additions and 118 deletions
src/main/java/com/bsth/entity/ScheduleRealInfo.java
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -181,6 +181,16 @@ public class ScheduleRealInfo implements Serializable{
 	private boolean ccService;
 	private Integer lpChange;
+	/**
+	 * rfid状态
+	 */
+	private int rfidState;
+
+	/**
+	 * 起点站rfid状态
+	 */
+	private int firstRfidState;
+
 	@Override
 	public int hashCode() {
 		return (this.id + this.scheduleDateStr + this.xlBm + this.fcsj).hashCode();
@@ -631,6 +641,22 @@ public class ScheduleRealInfo implements Serializable{
 		this.jhlcOrig = jhlcOrig;
 	}
+	public int getRfidState() {
+		return rfidState;
+	}
+
+	public void setRfidState(int rfidState) {
+		this.rfidState = rfidState;
+	}
+
+	public int getFirstRfidState() {
+		return firstRfidState;
+	}
+
+	public void setFirstRfidState(int firstRfidState) {
+		this.firstRfidState = firstRfidState;
+	}
+
 	@Transient
 	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
 	/**
@@ -257,26 +257,6 @@ public class BigscreenService {
     	}
-    	String cardSignSql="select xl_bm,xl_name,schedule_date_str,bcs,qks,rkgzs,ckgzs"
-    			+ " from card_signing "
-    			+ " where schedule_date_str >= '"+date2+"' and schedule_date_str <= '"+date+"'";
-    	List<Map<String, Object>> cardSignList=jdbcTemplate.query(cardSignSql,
-				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("lineCode",rs.getString("xl_bm"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("schedule_date_str"));
-						m.put("bcs",  rs.getString("bcs"));
-						m.put("qks",  rs.getString("qks"));
-						m.put("rkgzs",  rs.getString("rkgzs"));
-						m.put("ckgzs",  rs.getString("ckgzs"));
-						return m;
-					}
-				});
-    	
-    	
     	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
     			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
     			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
@@ -368,8 +348,6 @@ public class BigscreenService {
 		    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
 		    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
 		    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
-//		    		bcs_qk += Long.valueOf(t.get("jhbc").toString());
-		    		bcs_qk += Long.valueOf(t.get("sjbc").toString());
 		    		if(gpSet.contains(t.get("lineCode").toString())){
 		    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
 		    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
@@ -411,7 +389,6 @@ public class BigscreenService {
 	    		Map<String, Object> smMap = smList.get(datesMap.get(d));
 	    		Map<String, Object> qqMap = qqList.get(datesMap.get(d));
 	    		Map<String, Object> gpMap = gpList.get(datesMap.get(d));
-	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
 	    		ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
 	    		ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
@@ -421,8 +398,6 @@ public class BigscreenService {
 	    		smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
 	    		qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
 	    		qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
-//    			qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
-    			qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("sjbc").toString()));
 	    		if(gpSet.contains(t.get("lineCode").toString())){
 	    			gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
 	    			gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
@@ -431,19 +406,36 @@ public class BigscreenService {
     		}
     	}
-    	for(Map<String, Object> t : cardSignList){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			String d = t.get("date").toString();
-    			if(date.equals(d)){
-//    				bcs_qk += Long.valueOf(t.get("bcs").toString());
-    				qks += Long.valueOf(t.get("qks").toString());
-    			}
-    			Map<String, Object> qkMap = qkList.get(datesMap.get(d));
-//    			qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("bcs").toString()));
-    			qkMap.put("sj", Long.valueOf(qkMap.get("sj").toString()) + Long.valueOf(t.get("qks").toString()));
+    	
+    	//计算签卡率
+    	for(String d : dates){
+    		if(d!=null && d.trim().length() > 0){
+    			List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(d);
+	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
+	    		long jh = 0, sj = 0;
+	    		for(ScheduleRealInfo s : findAll){
+	    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+		    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
+		    				++jh;
+		    				String sty = decimalToBinary(s.getRfidState());
+		    				Integer state = Integer.parseInt(sty);
+		    				if ((state & 4) == 4) {
+		    					++sj;
+		    				}
+		    			}
+	    			}
+	    		}
+	    		qkMap.put("jh", jh);
+	    		qkMap.put("sj", sj);
+	    		
+	    		if(date.equals(d)){
+	    			bcs_qk = jh;
+	    			qks = sj;
+	    		}
     		}
     	}
+    	
     	List<Map<String, Object>> zxlList = new ArrayList<Map<String, Object>>();
     	zxlList.addAll(ccList);
     	zxlList.addAll(bcList);
@@ -696,27 +688,6 @@ public class BigscreenService {
     	}
-    	String cardSignSql="select xl_bm,xl_name,schedule_date_str,bcs,qks,rkgzs,ckgzs"
-    			+ " from card_signing "
-    			+ " where schedule_date_str >= '"+date2+"' and schedule_date_str <= '"+date+"'"
-    			+ " and gs_bm = '"+gsdm+"'";
-    	List<Map<String, Object>> cardSignList=jdbcTemplate.query(cardSignSql,
-				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("lineCode",rs.getString("xl_bm"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("schedule_date_str"));
-						m.put("bcs",  rs.getString("bcs"));
-						m.put("qks",  rs.getString("qks"));
-						m.put("rkgzs",  rs.getString("rkgzs"));
-						m.put("ckgzs",  rs.getString("ckgzs"));
-						return m;
-					}
-				});
-    	
-    	
     	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
     			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
     			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
@@ -808,8 +779,6 @@ public class BigscreenService {
 		    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
 		    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
 		    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
-//		    		bcs_qk += Long.valueOf(t.get("jhbc").toString());
-		    		bcs_qk += Long.valueOf(t.get("sjbc").toString());
 		    		if(gpSet.contains(t.get("lineCode").toString())){
 		    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
 		    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
@@ -851,7 +820,6 @@ public class BigscreenService {
 	    		Map<String, Object> smMap = smList.get(datesMap.get(d));
 	    		Map<String, Object> qqMap = qqList.get(datesMap.get(d));
 	    		Map<String, Object> gpMap = gpList.get(datesMap.get(d));
-	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
 	    		ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
 	    		ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
@@ -861,8 +829,6 @@ public class BigscreenService {
 	    		smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
 	    		qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
 	    		qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
-//	    		qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
-	    		qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("sjbc").toString()));
 	    		if(gpSet.contains(t.get("lineCode").toString())){
 	    			gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
 	    			gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
@@ -871,19 +837,38 @@ public class BigscreenService {
     		}
     	}
-    	for(Map<String, Object> t : cardSignList){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			String d = t.get("date").toString();
-    			if(date.equals(d)){
-//    				bcs_qk += Long.valueOf(t.get("bcs").toString());
-    				qks += Long.valueOf(t.get("qks").toString());
-    			}
-    			Map<String, Object> qkMap = qkList.get(datesMap.get(d));
-//    			qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("bcs").toString()));
-    			qkMap.put("sj", Long.valueOf(qkMap.get("sj").toString()) + Long.valueOf(t.get("qks").toString()));
+    	
+    	//计算签卡率
+    	for(String d : dates){
+    		if(d!=null && d.trim().length() > 0){
+    			List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(d);
+	    		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(gsdm)){
+		    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+			    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
+			    				++jh;
+			    				String sty = decimalToBinary(s.getRfidState());
+			    				Integer state = Integer.parseInt(sty);
+			    				if ((state & 4) == 4) {
+			    					++sj;
+			    				}
+			    			}
+		    			}
+	    			}
+	    		}
+	    		qkMap.put("jh", jh);
+	    		qkMap.put("sj", sj);
+	    		
+	    		if(date.equals(d)){
+	    			bcs_qk = jh;
+	    			qks = sj;
+	    		}
     		}
     	}
+    	
     	List<Map<String, Object>> zxlList = new ArrayList<Map<String, Object>>();
     	zxlList.addAll(ccList);
     	zxlList.addAll(bcList);
@@ -2111,27 +2096,6 @@ public class BigscreenService {
 				});
-    	String cardSignSql="select gs_bm,xl_bm,xl_name,schedule_date_str,bcs,qks,rkgzs,ckgzs"
-    			+ " from card_signing "
-    			+ " where schedule_date_str = '"+date+"'";
-    	List<Map<String, Object>> cardSignList=jdbcTemplate.query(cardSignSql,
-				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("gs",rs.getString("gs_bm")!=null?gsMap.get(rs.getString("gs_bm")):"");
-						m.put("lineCode",rs.getString("xl_bm"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("schedule_date_str"));
-						m.put("bcs",  rs.getString("bcs"));
-						m.put("qks",  rs.getString("qks"));
-						m.put("rkgzs",  rs.getString("rkgzs"));
-						m.put("ckgzs",  rs.getString("ckgzs"));
-						return m;
-					}
-				});
-    	
-    	
     	Map<String, Integer> sortMap = new HashMap<String, Integer>();
     	sortMap.put("杨高", 0);
     	sortMap.put("上南", 1);
@@ -2167,8 +2131,6 @@ public class BigscreenService {
     				mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
     				mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
     				mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
-//					mapPut(m, "bcs", t.get("jhbc").toString());
-					mapPut(m, "bcs", t.get("sjbc").toString());
     				if(gpSet.contains(t.get("lineCode").toString())){
         				mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
         				mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
@@ -2185,8 +2147,6 @@ public class BigscreenService {
 				mapPut(pjMap, "sjsmbc", t.get("sjsmbczds").toString());
 				mapPut(pjMap, "jhqqbc", t.get("jhszfcs").toString());
 				mapPut(pjMap, "sjqqzd", t.get("sjszfczds").toString());
-//	    		mapPut(pjMap, "bcs", t.get("jhbc").toString());
-	    		mapPut(pjMap, "bcs", t.get("sjbc").toString());
 				if(gpSet.contains(t.get("lineCode").toString())){
     				mapPut(pjMap, "jhgpqqbc", t.get("jhszfcs").toString());
     				mapPut(pjMap, "sjgpqqzd", t.get("sjszfczds").toString());
@@ -2196,23 +2156,31 @@ public class BigscreenService {
     		}
     	}
-    	for(Map<String, Object> t : cardSignList){
-    		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, "bcs", t.get("bcs").toString());
-					mapPut(m, "qks", t.get("qks").toString());
-//					mapPut(m, "rkgzs", t.get("rkgzs").toString());
-//					mapPut(m, "ckgzs", t.get("ckgzs").toString());
-	    		}
-	    		
-//	    		mapPut(pjMap, "bcs", t.get("bcs").toString());
-				mapPut(pjMap, "qks", t.get("qks").toString());
-//				mapPut(pjMap, "rkgzs", t.get("rkgzs").toString());
-//				mapPut(pjMap, "ckgzs", t.get("ckgzs").toString());
-    		}
-    	}
+    	//计算签卡率
+		List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
+		long jh = 0, sj = 0;
+		for(ScheduleRealInfo s : findAll){
+			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+				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())));
+						++jh;
+						mapPut(m, "bcs", 1);
+						String sty = decimalToBinary(s.getRfidState());
+	    				Integer state = Integer.parseInt(sty);
+	    				if ((state & 4) == 4) {
+	    					++sj;
+	    					mapPut(m, "qks", 1);
+	    				}
+					}
+				}
+			}
+		}
+		mapPut(pjMap, "bcs", jh);
+		mapPut(pjMap, "qks", sj);
+		
+		
     	for(Map<String, Object> m : resList){
     		m.put("date", date);
@@ -2814,7 +2782,7 @@ public class BigscreenService {
     	}
     	for(ScheduleRealInfo s : list_s){
-    		if(!(isInOut(s)) && !s.isCcService()){
+    		if(!isInOut(s) && !s.isCcService()){
     			String[] split = s.getFcsj().split(":");
 				Long time = Long.valueOf(split[0]) * 60 + Long.valueOf(split[1]);
 				String minfcsj = minfcsjMap.get(s.getXlBm())!=null?minfcsjMap.get(s.getXlBm()).toString():"02:00";
@@ -2836,6 +2804,8 @@ 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;
@@ -2867,6 +2837,7 @@ public class BigscreenService {
     				} else if("26".equals(s.getGsBm())){
     					nh_zwd += 1;
     				}
+    				notYetList.add(s);
     			}
     		}
     	}
@@ -2881,15 +2852,12 @@ public class BigscreenService {
     	resMap.put("notYet_22", jg_zwd);
     	resMap.put("sum_26", nh_z);
     	resMap.put("notYet_26", nh_zwd);
+    	resMap.put("notYetList", notYetList);
     	return resMap;
     }
     public static void main(String[] args){
-    	double a = 0.10;
-    	double b = 0.0;
-    	BigDecimal a1 = new BigDecimal(a);
-    	BigDecimal b1 = new BigDecimal(b);
-    	System.out.println(a1.compareTo(b1));
+    	
     }
     public List<Map<String, Object>> createMap(String type, String[] dates){
@@ -3158,5 +3126,17 @@ public class BigscreenService {
 			return o1.getFcsjActualTime().compareTo(o2.getFcsjActualTime());
 		}
 	}
+	
+	public static String decimalToBinary(int n) {
+		String str = "";
+		if(n == 0){
+			return str = "0";
+		}
+		while (n != 0) {
+			str = n % 2 + str;
+			n = n / 2;
+		}
+		return str;
+	}
 }