更改最早发车时间获取方法

廖磊
1 parent df2151cf
Showing 4 changed files with 93 additions and 57 deletions
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
@@ -39,6 +39,9 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query(value = "  SELECT l FROM Line l where l.name like ?1")
 	List<Line> findLine(String line);
+	
+	@Query(value = "  SELECT l FROM Line l where l.lineCode = ?1")
+	List<Line> findLineByCode(String lineCode);
 	public Line findByLineCode(String string);
@@ -783,11 +783,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             state = state + "+1";
             type = "ASC";
         }
-        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-         		+ " id = ("
-         		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-         		+ ")";
-         String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
         String sqlPlan ="select * from  (select * from ("
         		+ " select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
         		+ " s.lp_Name as lpName,s.j_Name as jName,max(s.schedule_date_str) as dateStr ,"
@@ -902,11 +906,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //      map=new HashMap<String,Object>();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-        		+ " id = ("
-        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-        		+ ")";
-        String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
 		String[] minSjs = minfcsj.split(":");
 		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -2076,11 +2084,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> list = null;
         list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-        		+ " id = ("
-        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-        		+ ")";
-        String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
 		String[] minSjs = minfcsj.split(":");
 		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -2177,11 +2189,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> list = null;
         list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-                + " id = ("
-                + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-                + ")";
-        String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
         String[] minSjs = minfcsj.split(":");
         Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -4352,11 +4368,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //    map=new HashMap<String,Object>();
       SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-      String sqlMinYysj="select start_opt from bsth_c_line_config where "
-      		+ " id = ("
-      		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(listpl.get(0).getXlBm()) +"'"
-      		+ ")";
-      String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+      String minfcsj="02:00";
+      List<Line> lineList=lineRepository.findLineByCode(listpl.get(0).getXlBm());
+      if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+      }
 		String[] minSjs = minfcsj.split(":");
 		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -373,11 +373,15 @@ public class ReportServiceImpl implements ReportService{
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-		String sqlMinYysj="select start_opt from bsth_c_line_config where "
-				+ " id = ("
-				+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-				+ ")";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
 		String[] minSjs = minfcsj.split(":");
 		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
 		//查询时间里程
@@ -774,11 +778,15 @@ public class ReportServiceImpl implements ReportService{
 		List<Map<String, Object>> list =new ArrayList<>();
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-		String sqlMinYysj="select start_opt from bsth_c_line_config where "
-				+ " id = ("
-				+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-				+ ")";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
 		//查询全程
 		String sqlqc="select t.* from ( "
@@ -859,8 +867,15 @@ public class ReportServiceImpl implements ReportService{
 	public List<Map<String, Object>> tbodyTime5(String line, String ttinfo) {
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-		String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
 		String[] minSjs = minfcsj.split(":");
 		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
 		//查询时间里程
@@ -2266,11 +2281,15 @@ public class ReportServiceImpl implements ReportService{
 	@Override
 	public List<Map<String, Object>> queryInOutStrtions(String line, String date, int zd,String lzsj) {
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		String sqlMinYysj="select start_opt from bsth_c_line_config where "
-				+ " id = ("
-				+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-				+ ")";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
 		List<ArrivalInfo> arrInfoList=this.load4(line, date, zd,minfcsj);
 		//查询线路所有的站点
@@ -149,20 +149,15 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 //		String line =map.get("line").toString();
 //		String date =map.get("date").toString();
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-        		+ " id = ("
-        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-        		+ ")";
-        List<String> listMin=jdbcTemplate.query(sqlMinYysj, 
-				 new RowMapper<String>(){
-			 @Override 
-			 public String mapRow(ResultSet rs, int rowNum) throws SQLException { 
-				 String s=rs.getString("start_opt");
-				 return s;
-			 }
-		});
-        if(listMin.size()>0){
-		String minfcsj=listMin.get(0);
+		String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
 		String[] minSjs = minfcsj.split(":");
 		//车辆最早发车时间 用了过滤超第二天0点的数据
 		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -602,7 +597,6 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 				  fage=false;
 			  }
 		  }
-        }
 		return listAdd;
 	}