大间隔统计接口，添加备注字段；挂牌线路接口；

娄高锋
1 parent 30fb7355
Showing 2 changed files with 53 additions and 6 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -25,7 +25,6 @@ import javax.ws.rs.core.MediaType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.support.collections.RedisMap;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Component;
@@ -38,7 +37,6 @@ import com.bsth.repository.DestroySituationRepository;
 import com.bsth.repository.ScheduleRealInfoRepository;
 import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
 import com.bsth.util.Arith;
-import com.mysql.fabric.xmlrpc.base.Array;
 @Component
 @Path("/bigdata")
@@ -1482,4 +1480,30 @@ public class BigdataService {
     	return resList;
     }
+    //全部挂牌线路
+    @GET
+    @Path("/findLinePlate/all")
+    public List<Map<String, Object>> findLinePlate() {
+    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				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("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") == null || t.get("lineCode").toString().trim().length() == 0){
+    			t.put("lineCode", "");
+    		}
+    		resList.add(t);
+    	}
+    	return resList;
+    }
+    
 }
@@ -26,6 +26,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import org.apache.commons.lang.StringUtils;
+import org.codehaus.stax2.evt.DTD2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,7 @@ import com.bsth.entity.ChildTaskPlan;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.repository.ScheduleRealInfoRepository;
 import com.bsth.util.Arith;
+import com.mysql.fabric.xmlrpc.base.Array;
 @Component
 @Path("/bigscreen")
@@ -2212,8 +2214,27 @@ public class BigscreenService {
     /** 报备登记查询接口 */
     @GET
-    @Path("/selectData/getReport")
-    public List<Map<String, Object>> getReport(){
+    @Path("/selectData/getReport/startDate/{startDate}/endDate/{endDate}")
+    public List<Map<String, Object>> getReport(@PathParam("startDate") String starDate,
+    		@PathParam("endDate") String endDate){
+    	Date d1 = new Date(), d2 = new Date();
+    	try{
+    		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+    		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    		d1 = sd.parse(starDate);
+    		d2 = sd.parse(endDate);
+    		d2.setTime(d2.getTime() + (1l*1000*60*60*24 - 1));
+    		starDate = sdf.format(d1);
+    		endDate = sdf.format(d2);
+    	}catch(ParseException e){
+			// TODO Auto-generated catch block
+    		e.printStackTrace();
+    		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+    		Map<String, Object> result = new HashMap<String, Object>();
+    		result.put("msg", "参数日期格式错误");
+    		list.add(result);
+    		return list;
+    	}
     	String sql="SELECT ID,REPORT_TYPE,REPORT_GS,REPORT_FGS,REPORT_GSNAME,REPORT_FGSNAME,"
     			+ " REPORT_DATE,REPORT_BBR,REPORT_XL,REPORT_XLNAME,REPORT_STATION,REPORT_DWSBBM,"
     			+ " REPORT_DWSBSJ,REPORT_YWSJ,REPORT_SMBWD,REPORT_DJGSJ,REPORT_DJGYY,REPORT_TFSJ,"
@@ -2221,8 +2242,9 @@ public class BigscreenService {
     			+ " REPORT_SGSJ,REPORT_SGDD,REPORT_XSFX,REPORT_SGDX,REPORT_DXPZH,REPORT_SGGK,"
     			+ " REPORT_SSRS,REPORT_SWRS,REPORT_BGR,REPORT_BGRDH,REPORT_BZ,REPORT_ROAD,STATUS,"
     			+ " CREATE_BY,CREATE_DATE,UPDATE_BY,UPDATE_DATE"
-    			+ " from bsth_t_report ";
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			+ " from bsth_t_report "
+    			+ " where REPORT_DATE >= ? and REPORT_DATE <= ?";
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{starDate, endDate},
 				new RowMapper<Map<String, Object>>(){
 					@Override
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2340,6 +2362,7 @@ public class BigscreenService {
 						m.put("jhfc2", rs.getString("jhfc2"));
 						m.put("sjfc2", rs.getString("sjfc2"));
 						m.put("subTime", rs.getString("sub_time"));
+						m.put("remark", rs.getString("remark"));
 						return m;
 					}
 				});