| 
					
				 | 
			
			
				@@ -87,7 +87,7 @@ public class Device implements Serializable{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public static String buildDeviceStr(Device device){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Date timestamp = device.getTimestamp(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         timestamp = DateUtil.calculateByHour(timestamp, 8); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String date = new SimpleDateFormat("yy-MM-dd HH:mm:ss").format(timestamp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        String date = new SimpleDateFormat("yyMMddHHmmss").format(timestamp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         StringBuilder builder = new StringBuilder(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         builder.append(device.getDeviceId()).append(","); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         builder.append(date).append(","); 
			 |