班次到离站处理分表数据

廖磊
1 parent 0d4caf81
Showing 2 changed files with 17 additions and 17 deletions
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -48,7 +48,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
-	@Query("SELECT L FROM Line L where L.destroy=0 and remove !=1")
+	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
 	List<Line> findAllService();
@@ -96,7 +96,7 @@ public class ReportServiceImpl implements ReportService{
 			Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
 			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
 			Date dates=simpleDateFormat.parse(date+" 00:00:00");
-			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates);
+			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates,date);
 			for(int i=0;i<lists.size();i++){
 				ArrivalInfo t1=lists.get(i);
@@ -123,7 +123,7 @@ public class ReportServiceImpl implements ReportService{
 	}
-	public List<ArrivalInfo> load(String line,String sbbb,Long date1,Long date2,Date dates){
+	public List<ArrivalInfo> load(String line,String sbbb,Long date1,Long date2,Date dates,String date){
 		List<ArrivalInfo> list = null;
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates);
@@ -133,8 +133,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
+		String year=date.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
@@ -194,7 +194,7 @@ public class ReportServiceImpl implements ReportService{
 			Long date2=simpleDateFormat.parse(ddsj+":00").getTime();
 			Date dates1=simpleDateFormat.parse(fcsj+":00");
 			Date dates2=simpleDateFormat.parse(ddsj+":00");
-			List<ArrivalInfo> lists=load2(line,date1,date2,dates1,dates2,zd,zdlx);
+			List<ArrivalInfo> lists=load2(line,date1,date2,dates1,dates2,zd,zdlx,fcsj);
 			for(int i=0;i<lists.size();i++){
 				ArrivalInfo t1=lists.get(i);
@@ -224,7 +224,7 @@ public class ReportServiceImpl implements ReportService{
 	}
-	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx){
+	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx,String fcsj){
 		List<ArrivalInfo> list = null;
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates1);
@@ -235,8 +235,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year>=? "
+		String year=fcsj.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year>=? "
 				+ " AND weeks_year<=? AND ts > ? AND ts <=? AND up_down=? AND stop_no like ? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
@@ -2179,8 +2179,8 @@ public class ReportServiceImpl implements ReportService{
 			Connection conn = null;
 			PreparedStatement ps = null;
 			ResultSet rs = null;
-
-			String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year=? "
+			String year=date.substring(0,4);
+			String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year=? "
 					+ " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
 			try{
 				conn = DBUtils_MS.getConnection();
@@ -2229,8 +2229,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year=? "
+		String year=date.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year=? "
 				+ " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
 		try{
 			conn = DBUtils_MS.getConnection();
@@ -3529,7 +3529,7 @@ public class ReportServiceImpl implements ReportService{
 			Long date1 = simpleDateFormat.parse(date+" 00:00:01").getTime();
 			Long date2=simpleDateFormat.parse(date+" 23:59:59").getTime();
 			Date dates=simpleDateFormat.parse(date+" 00:00:00");
-			List<ArrivalInfo> lists=load_online(line,date1,date2,dates);
+			List<ArrivalInfo> lists=load_online(line,date1,date2,dates,date);
 			for (int i = 0; i < list.size(); i++) {
 				String nbbm=list.get(i);
 				String sbbb=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
@@ -3582,7 +3582,7 @@ public class ReportServiceImpl implements ReportService{
 		return map;
 	}
-	public List<ArrivalInfo> load_online(String line,Long date1,Long date2,Date dates){
+	public List<ArrivalInfo> load_online(String line,Long date1,Long date2,Date dates,String date){
 		List<ArrivalInfo> list = null;
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates);
@@ -3592,8 +3592,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where  line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
+		String year=date.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where  line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);