From 7b99d2d444e8b0bf8d608fe01889c68524f11662 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 15 八月 2023 18:12:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 3bdb703..f8cf708 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -1,5 +1,6 @@
package com.supersavedriving.driver.modular.system.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -48,6 +49,9 @@
import java.math.RoundingMode;
import java.net.InetAddress;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.*;
/**
@@ -512,7 +516,7 @@
}
String value1 = redisUtil.getValue("DRIVER" + s.getDriverId());
if(s.getDriverId().compareTo(uid) != 0 && ToolUtil.isNotEmpty(value1)){
- list.add(s.getLocation().getX() + "," + s.getLocation().getY()+","+i);
+ list.add(s.getLocation().getX() + "," + s.getLocation().getY()+","+i+","+driver.getName());
}
});
}
@@ -524,7 +528,12 @@
orders.forEach(e-> blue.add(e.getStartLng()+","+e.getStartLat()));
map.put("orderList",blue);
- List<Order> ordersOne = orderService.selectList(new EntityWrapper<Order>().eq("state",301));
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(System.currentTimeMillis());
+ calendar.add(Calendar.HOUR_OF_DAY, -2);
+ Date time = calendar.getTime();
+ List<Order> ordersOne = orderService.selectList(new EntityWrapper<Order>().eq("state",301).between("createTime",time,new Date()));
ArrayList<String> red = new ArrayList<>();
ordersOne.forEach(e-> red.add(e.getStartLng()+","+e.getStartLat()));
@@ -534,6 +543,7 @@
}
+
/**
* 添加司机定位
* @param driverPositionWarpper
--
Gitblit v1.7.1