| 
					
				 | 
			
			
				@@ -7,15 +7,19 @@ import com.aidex.common.gps.common.GpsApi; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.aidex.common.gps.common.GpsRequest; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.aidex.common.gps.domain.DeviceEntity; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.aidex.common.gps.domain.LocationEntity; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.aidex.common.gps.domain.MileageEntity; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.aidex.common.gps.server.IGpsService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.aidex.common.utils.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.aidex.system.domain.SysShip; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.aidex.system.service.SysShipService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.alibaba.fastjson2.JSON; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson2.JSONObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import java.util.ArrayList; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.time.LocalDate; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.time.LocalDateTime; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.time.LocalTime; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.time.ZoneId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.stream.Collectors; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -66,4 +70,21 @@ public class GpsService implements IGpsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<LocationEntity> locationEntities = gpsRequest.postArray(params).toJavaList(LocationEntity.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          return locationEntities; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<MileageEntity> getMileageStatisics(String startTime,String endTime){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Long startOfDay, endOfDay ; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            LocalDate today = LocalDate.now(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            startOfDay = today.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            endOfDay = LocalDateTime.of(today, LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            startOfDay = Long.valueOf(startTime); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            endOfDay = Long.valueOf(endTime); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Map<String, Object> params = generatorGspApi.GeneratorQueryParams(GpsApi.mileageStatustics); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        params.put("startTime",startTime); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        params.put("endTime", endOfDay); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<MileageEntity> mileageEntities = gpsRequest.post(params).getJSONArray("rows").toJavaList(MileageEntity.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return mileageEntities; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |