Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents a156cf92 641a7822
Showing 3 changed files with 102 additions and 7 deletions
src/main/java/com/bsth/entity/excep/Offline.java
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
src/main/resources/static/pages/excep/offlineList.html
@@ -72,6 +72,40 @@ public class Offline {
 	private String jsy;
 	@Transient
 	private String lpname;
+    @Transient
+    private Long ts;
+    
+    @Transient
+    private String tsdate;
+    @Transient
+    private String deviceid;
+    
+	public String getDeviceid() {
+		return deviceid;
+	}
+
+	public void setDeviceid(String deviceid) {
+		this.deviceid = deviceid;
+	}
+
+
+
+	public String getTsdate() {
+		return tsdate;
+	}
+
+	public void setTsdate(String tsdate) {
+		this.tsdate = tsdate;
+	}
+
+	public Long getTs() {
+		return ts;
+	}
+
+	public void setTs(Long ts) {
+		this.ts = ts;
+	}
+
 	public Integer getId() {
 		return id;
 	}
@@ -4,6 +4,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -34,6 +35,35 @@ public class OfflineServiceImpl implements OfflineService {
 	@Autowired
 	JdbcTemplate jdbcTemplate;
+	public List<Offline> findGPS(Map<String, Object> map) {
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		List<Offline> list=new ArrayList<Offline>();
+		String days_year=map.get("days_year").toString();
+		String line_id=map.get("line_id").toString();
+		String device_id=map.get("device_id").toString();
+		String sql="SELECT t.line_id,t.device_id,MIN(ts) as ts,days_year FROM bsth_c_gps_info t "
+				+ "  WHERE t.line_id='"+line_id+"' and t.device_id='"+device_id+"' and t.days_year='"+days_year+"' "
+				+ "  GROUP BY  t.device_id,t.line_id ";
+		sql +=" order by ts limit ?,?";
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1,0*10); // O-最大条数  -- M-起始条数
+			ps.setInt(2, 100000000); // O-最小条数 -- M-显示条数
+			rs = ps.executeQuery();
+			list = resultSet(rs);
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		
+		return list;
+	}
+	
  //	@Override
 	static List<Offline> findAll(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -100,7 +130,18 @@ public class OfflineServiceImpl implements OfflineService {
 		return list;
 	}
-
+ public  List<Offline> resultSet(ResultSet rs) throws SQLException{
+	// TODO Auto-generated method stub
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			List<Offline> list=new ArrayList<Offline>();
+			Offline offline;
+			while(rs.next()){
+				offline=new Offline();
+				offline.setTs(Long.parseLong(rs.getObject("ts").toString()));
+				list.add(offline);
+			}
+			return list;
+ }
 	/**
 	 * 数据转换
 	 */
@@ -122,6 +163,7 @@ public class OfflineServiceImpl implements OfflineService {
 			offline.setTimestampDate(sdf.format(new Date(offline.getTimestamp())));
 			offline.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
 			offline.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+			offline.setDeviceid(rs.getObject("vehicle").toString());
 			list.add(offline);
 		}
 		return list;
@@ -190,7 +232,9 @@ public class OfflineServiceImpl implements OfflineService {
 //		List<T> list = this.baseDao.queryByObject(pageHelper.getMap());
 		List<Offline> list=findAll(pageHelper.getMap());
 		for (int i = 0; i < list.size(); i++) {
-			String nbbm2=list.get(i).getVehicle() ;
+			int lineid=	list.get(i).getLine();
+			String nbbm2=list.get(i).getVehicle();
+			String deviceid=list.get(i).getDeviceid();
 			Long d1=list.get(i).getTimestamp();
 			Date datess = new Date(d1);
 			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
@@ -209,10 +253,22 @@ public class OfflineServiceImpl implements OfflineService {
 			                return s;  
 			            }  
 					});
+			Map<String, Object> gpsmap=new HashMap<>();
+			String str = String.format("%tj",datess);
+			gpsmap.put("device_id",deviceid );
+			gpsmap.put("line_id", lineid);
+			gpsmap.put("days_year", str);
+		 List<Offline> gps=findGPS(gpsmap);
+	   if(gps.size()>0){
+		  Long ts= gps.get(0).getTs();
+		String ts1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(ts));
+		   list.get(0).setTsdate(ts1);
+	   }
 		if(pbb.size()>0){
 					list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
 					list.get(i).setLpname(pbb.get(0).getLpName());
 				}
+		
 		}
 		PageObject<Offline> pageObject = pageHelper.getPageObject();
@@ -56,11 +56,12 @@
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
 								<th width="13%">车辆自编号</th>
-								<th width="100">工号/名字</th>
+								<th width="10%">工号/名字</th>
 								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
-								<th width="18%">时间</th>
-								<th width="18%">操作</th>
+								<th width="18%">掉线时间</th>
+								<th width="18%">恢复时间</th>
+								<th width="20%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
@@ -87,11 +88,12 @@
 								<td>
 									<input class="form-control" type="date" name="date" />
 								</td>
+								<td></td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
-                                                                
-									<button class="btn btn-sm red btn-outline filter-cancel">
+                                                               <br> 
+									<button class="btn btn-sm red btn-outline filter-cancel ">
                                                             <i class="fa fa-times"></i> 重置</button>
 								</td>
 							</tr>
@@ -139,6 +141,9 @@
 		{{obj.timestampDate}}
 	</td>
 	<td>
+		{{obj.tsdate}}
+	</td>
+	<td>
 	</td>
 </tr>