车辆轨迹同步

performance-web/src/main/java/com/clx/performance/esplus/model/DriverTraceESPlus.java

@@ -2,11 +2,15 @@ package com.clx.performance.esplus.model;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.dromara.easyes.annotation.IndexField;
 import org.dromara.easyes.annotation.IndexId;
 import org.dromara.easyes.annotation.IndexName;
 import org.dromara.easyes.annotation.rely.FieldType;
 import org.dromara.easyes.annotation.rely.IdType;
+import org.elasticsearch.common.geo.GeoPoint;
 
 import java.math.BigDecimal;
 
@@ -24,7 +28,7 @@ public class DriverTraceESPlus {
     private Integer dataType;
 
     @IndexField(fieldType = FieldType.GEO_POINT)
-    private BigDecimal[] location;  //位置
+    private GPS location;
 
     @ApiModelProperty("速度")
     private BigDecimal speed;
@@ -38,4 +42,16 @@ public class DriverTraceESPlus {
     @IndexField(fieldType = FieldType.DATE)
     private String modifiedTime;
 
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    public static class GPS{
+        private BigDecimal lon;
+        private BigDecimal lat;
+
+        public GPS(BigDecimal lon, BigDecimal lat) {
+            this.lon = lon;
+            this.lat = lat;
+        }
+    }
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java

@@ -139,7 +139,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
             DriverTraceESPlus es = new DriverTraceESPlus();
             es.setUserNo(item.getUserNo());
             es.setDataType(item.getDataType());
-            es.setLocation(item.getLocation());
+            es.setLocation(new DriverTraceESPlus.GPS(item.getLocation()[0], item.getLocation()[1]));
             es.setPositionTime(item.getGpsTime());
             es.setCreateTime(LocalDateTimeUtils.formatTime());
             es.setModifiedTime(es.getCreateTime());
@@ -176,7 +176,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .limit(1)
         );
         if (!list1.isEmpty()){
-            return list1.get(0).getLocation();
+            return new BigDecimal[]{list1.get(0).getLocation().getLon(), list1.get(0).getLocation().getLat()};
         }
 
         return null;

performance-web/src/main/java/com/clx/performance/struct/trace/DriverTraceStruct.java

@@ -15,8 +15,8 @@ import java.util.List;
 @Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class, BigDecimal.class})
 public interface DriverTraceStruct {
 
-    @Mapping(target = "longitude", expression = "java(item.getLocation()[0])")
-    @Mapping(target = "latitude", expression = "java(item.getLocation()[1])")
+    @Mapping(target = "longitude", expression = "java(item.getLocation().getLon())")
+    @Mapping(target = "latitude", expression = "java(item.getLocation().getLat())")
     @Mapping(target = "gpsTime", source = "positionTime")
     DriverTraceVO convert(DriverTraceESPlus item);
     List<DriverTraceVO> convert(List<DriverTraceESPlus> list);