行驶时间及车速表实际营运时间重新排序计算

娄高锋
1 parent b09e420d
Showing 1 changed file with 44 additions and 16 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -114,15 +114,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
 					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
-						fcsj += 1440l;
-						zdsj += 1440l;
+						if(fcsj<23*60)	fcsj += 1440l;
+						if(zdsj<23*60)	zdsj += 1440l;
 					}
 					if(zdsj < fcsj)
 						zdsj += 1440l;
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
 						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
 						schedule.setDfsjT(dfsj);
@@ -130,7 +130,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getFcsjActual() != null){
 						String[] split2 = schedule.getFcsjActual().split(":");
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
 						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
@@ -138,7 +138,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getZdsjActual() != null){
 						String[] split4 = schedule.getZdsjActual().split(":");
 						long zdsjA = Long.valueOf(split4[0]) * 60 + Long.valueOf(split4[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&zdsjA<23*60)
 							zdsjA += 1440l;
 						if(schedule.getFcsjActualTime() != null && zdsjA < schedule.getFcsjActualTime())
 							zdsjA += 1440l;
@@ -648,7 +648,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
 						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
 						schedule.setDfsjT(dfsj);
@@ -656,7 +656,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getFcsjActual() != null){
 						String[] split2 = schedule.getFcsjActual().split(":");
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
 						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
@@ -664,7 +664,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getZdsjActual() != null){
 						String[] split4 = schedule.getZdsjActual().split(":");
 						long zdsjA = Long.valueOf(split4[0]) * 60 + Long.valueOf(split4[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&zdsjA<23*60)
 							zdsjA += 1440l;
 						schedule.setZdsjActual(zdsjA/60 + ":" + zdsjA%60);
 						schedule.setZdsjActualTime(zdsjA);
@@ -675,8 +675,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
-						fcsj += 1440l;
-						zdsj += 1440l;
+						if(fcsj<23*60)	fcsj += 1440l;
+						if(zdsj<23*60)	zdsj += 1440l;
 					}
 					schedule.setFcsj(fcsj/60 + ":" + fcsj%60);
 					schedule.setZdsj(zdsj/60 + ":" + zdsj%60);
@@ -773,6 +773,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			List<Long> keyList = new ArrayList<Long>();
+			List<Long> keyList2 = new ArrayList<Long>();
 			List<ScheduleRealInfo> list2 = keyMap.get(key);
 			long jhyysj = 0, sjyysj = 0;
 			long jhyssj = 0, sjyssj = 0;
@@ -794,6 +795,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					keyList.add(fcsj);
 				}
 				sortMap.put(fcsj, schedule);
+
 			}
 			Collections.sort(keyList);
@@ -884,12 +886,20 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					mapList.add(m);
 				}
 			}
-			for(int i = 1; i < mapList.size(); i++){
-				Map<String, Object> m1 = mapList.get(i - 1);
-				Map<String, Object> m2 = mapList.get(i);
-				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
-					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
-					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+
+			for(Map<String, Object> m : mapList){
+				if(m.get("fcsj") != null && m.get("fcsj").toString().trim().length()!=0){
+					keyList2.add(Long.valueOf(m.get("fcsj").toString()));
+				}
+			}
+			Collections.sort(keyList2);
+			for(long l : keyList2){
+				System.out.println(l);
+			}
+			for(int i = 1; i < keyList2.size(); i++){
+				long fcsj1 = keyList2.get(i - 1);
+				long fcsj2 = keyList2.get(i);
+				if(fcsj2 - fcsj1 < 90){
 					if(sfqr == 1 && time1 > fcsj1){
 						sjyysj += fcsj2 - time1;
 					}else if(sfqr == 1 && time2 < fcsj2){
@@ -898,7 +908,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyysj += fcsj2 - fcsj1;
 					}
 					sjyysj1 += fcsj2 - fcsj1;
+					System.out.println("---"+(fcsj2-fcsj1)+"---"+sjyysj+"---"+sjyysj1);
 				}
+			}
+			
+			for(int i = 1; i < mapList.size(); i++){
+				Map<String, Object> m1 = mapList.get(i - 1);
+				Map<String, Object> m2 = mapList.get(i);
+//				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
+//					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
+//					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+//					if(sfqr == 1 && time1 > fcsj1){
+//						sjyysj += fcsj2 - time1;
+//					}else if(sfqr == 1 && time2 < fcsj2){
+//						sjyysj += time2 - fcsj1;
+//					}else{
+//						sjyysj += fcsj2 - fcsj1;
+//					}
+//					sjyysj1 += fcsj2 - fcsj1;
+//				}
 				if(m2.get("fcsj") != null && m2.get("zdsj") != null){
 					long zdsj = Long.valueOf(m2.get("zdsj").toString());
 					long fcsj = Long.valueOf(m2.get("fcsj").toString());