|  | @@ -10,11 +10,15 @@ import com.aidex.common.plush.domain.SysShipExtend;
 | 
	
		
			
				|  |  |  import com.aidex.common.plush.service.GpsAlarmPlushService;
 | 
	
		
			
				|  |  |  import com.aidex.common.plush.service.GpsLocationPlushService;
 | 
	
		
			
				|  |  |  import com.aidex.common.plush.service.SysShipExtendService;
 | 
	
		
			
				|  |  | +import com.aidex.common.utils.StringUtils;
 | 
	
		
			
				|  |  |  import com.aidex.common.utils.dist.CalcDist;
 | 
	
		
			
				|  |  | +import com.aidex.common.utils.file.ImageUtils;
 | 
	
		
			
				|  |  |  import com.aidex.framework.cache.ConfigUtils;
 | 
	
		
			
				|  |  |  import com.aidex.system.domain.SysWharf;
 | 
	
		
			
				|  |  |  import com.aidex.system.service.SysWharfService;
 | 
	
		
			
				|  |  |  import com.alibaba.fastjson2.JSONArray;
 | 
	
		
			
				|  |  | +import org.slf4j.Logger;
 | 
	
		
			
				|  |  | +import org.slf4j.LoggerFactory;
 | 
	
		
			
				|  |  |  import org.springframework.beans.BeanUtils;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  |  import org.springframework.stereotype.Service;
 | 
	
	
		
			
				|  | @@ -27,6 +31,8 @@ import java.util.stream.Collectors;
 | 
	
		
			
				|  |  |  @Service
 | 
	
		
			
				|  |  |  public class GpsPlushService implements IGpsPlushService {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private SysShipExtendService sysShipExtendService;
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
	
		
			
				|  | @@ -37,6 +43,9 @@ public class GpsPlushService implements IGpsPlushService {
 | 
	
		
			
				|  |  |      private GpsAlarmPlushService gpsAlarmPlushService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      public void plush(String method, String serialNumber, String data){
 | 
	
		
			
				|  |  | +        log.info("接受数据方式:"+method+"接收数据:"+data);
 | 
	
		
			
				|  |  | +        if(StringUtils.isEmpty(data))
 | 
	
		
			
				|  |  | +            return;
 | 
	
		
			
				|  |  |          // 只接收报警和位置  其他数据丢弃
 | 
	
		
			
				|  |  |          if(method.equals(METHOD.ALARM)){
 | 
	
		
			
				|  |  |              List<PushAlarmEntity> pushAlarmEntities = JSONArray.parseArray(data).toList(PushAlarmEntity.class);
 |