全量事故接口使用营运日期去重，防止跨天烂班重复获取。

娄高锋
1 parent 66b2111f
Showing 1 changed file with 14 additions and 2 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
@@ -1332,7 +1332,7 @@ public class BigdataService {
     @Path("/getScheduleAccident/startDate/{startDate}/endDate/{endDate}")
     public List<Map<String, Object>> getScheduleAccident(@PathParam("startDate") String startDate,
     		@PathParam("endDate") String endDate) throws ParseException {
-    	String sql="select gs_bm,fgs_bm,real_exec_date,fcsj,fcsj_actual,xl_name,j_gh,j_name,cl_zbh,car_plate,remarks "
+    	String sql="select gs_bm,fgs_bm,schedule_date_str,real_exec_date,fcsj,fcsj_actual,xl_name,j_gh,j_name,cl_zbh,car_plate,remarks "
     			+ " from bsth_c_s_sp_info_real r left join bsth_c_cars c on r.cl_zbh = c.inside_code "
     			+ " where schedule_date_str >= ? and schedule_date_str <= ? "
     			+ " and ((adjust_exps like '%肇事%' and status = '-1') "
@@ -1342,7 +1342,7 @@ public class BigdataService {
     			+ " or remarks like '%&lt;肇事&gt;%'))) "
     			+ " order by real_exec_date, schedule_date_str, fcsj";
-    	List<Map<String, Object>> list=(List<Map<String, Object>>) jdbcTemplate.query(sql,
+    	List<Map<String, Object>> scheduleList=(List<Map<String, Object>>) jdbcTemplate.query(sql,
     			new Object[] {startDate, endDate},
 				new RowMapper<Map<String, Object>>(){
 					@Override
@@ -1350,6 +1350,7 @@ public class BigdataService {
 						Map<String, Object> m=new HashMap<String,Object>();
 						m.put("gs_bm",rs.getString("gs_bm"));
 						m.put("fgs_bm",rs.getString("fgs_bm"));
+						m.put("schedule_date_str",rs.getString("schedule_date_str"));
 						m.put("real_exec_date",rs.getString("real_exec_date"));
 						m.put("fcsj", rs.getString("fcsj"));
 						m.put("fcsj_actual",  rs.getString("fcsj_actual"));
@@ -1363,6 +1364,17 @@ public class BigdataService {
 					}
 		});
+    	List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+    	Set<String> tempSet = new HashSet<String>();
+    	for(Map<String, Object> m : scheduleList){ // 250312，3月8号有一条7号跨天的烂班，之前判断实际执行日期会重复获取。
+    		String key = m.get("schedule_date_str") + "/" + m.get("xl_name")
+    				+ "/" + m.get("j_gh") + "/" + m.get("j_name")
+    				+ "/" + m.get("cl_zbh") + "/" + m.get("car_plate");
+    		if(tempSet.add(key)){
+    			list.add(m);
+    		}
+    	}
+    	
     	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     	Date d1 = sdf.parse(startDate);
     	Date d2 = sdf.parse(endDate);