소스 검색

start_trip, start_trip_url, end_trip, end_trip_url,

guoyong 4 년 전
부모
커밋
b6c2f1e75e
2개의 변경된 파일10개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java
  2. 7 0
      src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

+ 3 - 1
src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @Description: 作业人员实体信息
  * @Author guoyong
@@ -87,7 +89,7 @@ public class WorkerInfo {
     private String latitude;
 
     @ApiModelProperty(value = "位置时间")
-    private String localTime;
+    private LocalDateTime localTime;
 
     @ApiModelProperty(value = "上次位置更新时间")
     private String lastTime;

+ 7 - 0
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -123,6 +123,13 @@ public class CommonServiceImpl implements CommonService {
             }
         }
 
+        LocationVO locationVO = getLocationByDate(truckId, LocalDateTime.now());
+        if (locationVO != null) {
+            workerInfo.setLatitude(locationVO.getLatitude());
+            workerInfo.setLongitude(locationVO.getLongitude());
+            workerInfo.setLocalTime(locationVO.getDate());
+        }
+
         return workerInfo;
     }