From 16ee4f20dc68b9e6a19490c935aa17bb325f8f0d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 01 八月 2025 09:03:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TripOrderVo.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TripOrderVo.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TripOrderVo.java
index ace2687..b17c46b 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TripOrderVo.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TripOrderVo.java
@@ -6,13 +6,12 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Data
@AllArgsConstructor
@@ -71,9 +70,10 @@
@ApiModelProperty("上车纬度")
private Double boardingLat;
@ApiModelProperty("上车时间")
- private LocalDateTime boardingTime;
+ private Date boardingTime; // 从LocalDateTime改为Date
+
@ApiModelProperty("到达时间")
- private LocalDateTime arriveTime;
+ private Date arriveTime; // 从LocalDateTime改为Date
@ApiModelProperty("城市")
private String city;
@ApiModelProperty("服务商")
@@ -82,7 +82,7 @@
public static List<TripOrderVo> getTripOrderVo(List<Map<String, Object>> maps) {
List<TripOrderVo> list = new ArrayList<>();
if (null != maps) {
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
for (Map<String, Object> map : maps) {
TripOrderVo tripOrderVo = new TripOrderVo();
@@ -110,10 +110,20 @@
tripOrderVo.setBoardingLon(null != map.get("boardingLon") ? Double.valueOf(String.valueOf(map.get("boardingLon"))) : 0D);
tripOrderVo.setBoardingLat(null != map.get("boardingLat") ? Double.valueOf(String.valueOf(map.get("boardingLat"))) : 0D);
tripOrderVo.setCity(null != map.get("city") ? String.valueOf(map.get("city")) : "");
- tripOrderVo.setBoardingTime(null != map.get("boardingTime") ?
- LocalDateTime.parse(String.valueOf(map.get("boardingTime")), formatter) : null);
- tripOrderVo.setArriveTime(null != map.get("arriveTime") ?
- LocalDateTime.parse(String.valueOf(map.get("arriveTime")), formatter) : null);
+ try {
+ tripOrderVo.setBoardingTime(null != map.get("boardingTime") ?
+ sdf.parse(String.valueOf(map.get("boardingTime"))) : null);
+ } catch (ParseException e) {
+ // 处理解析异常
+ tripOrderVo.setBoardingTime(null);
+ }
+ try {
+ tripOrderVo.setArriveTime(null != map.get("arriveTime") ?
+ sdf.parse(String.valueOf(map.get("arriveTime"))) : null);
+ } catch (ParseException e) {
+ // 处理解析异常
+ tripOrderVo.setArriveTime(null);
+ }
tripOrderVo.setCompanyName(null != map.get("companyName") ? String.valueOf(map.get("companyName")) : "");
tripOrderVo.setCarId(null != map.get("carId") ? Integer.valueOf(String.valueOf(map.get("carId"))) : 0);
tripOrderVo.setServerCarModelId(null != map.get("serverCarModelId") ? Integer.valueOf(String.valueOf(map.get("serverCarModelId"))) : 0);
--
Gitblit v1.7.1