From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
index ae3613d..3fded99 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -2,17 +2,12 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.supersavedriving.driver.core.util.ToolUtil;
-import com.supersavedriving.driver.modular.system.model.DriverWork;
-import com.supersavedriving.driver.modular.system.model.Order;
-import com.supersavedriving.driver.modular.system.service.IDriverWorkService;
import com.supersavedriving.driver.modular.system.service.IOrderPositionService;
+import com.supersavedriving.driver.core.util.ToolUtil;
+import com.supersavedriving.driver.modular.system.model.Order;
import com.supersavedriving.driver.modular.system.service.IOrderService;
import com.supersavedriving.driver.modular.system.util.GeodesyUtil;
import com.supersavedriving.driver.modular.system.util.RedisUtil;
-import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.warpper.DriverPositionWarpper;
import com.supersavedriving.driver.modular.system.warpper.OrderPositionWarpper;
import com.supersavedriving.driver.modular.system.warpper.ProcessOperationsWarpper;
@@ -108,8 +103,16 @@
if(50 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟（5秒上传一次数据）
Integer integer = map.get(order.getId().toString());
map.put(order.getId().toString(), integer++);
- order.setState(401);//进入等待状态
- order.setStartWaitTime(new Date());
+ //进入等待状态
+ ProcessOperationsWarpper processOperationsWarpper = new ProcessOperationsWarpper();
+ processOperationsWarpper.setOrderId(order.getId());
+ processOperationsWarpper.setState(401);
+ try {
+ orderService.driverProcessOperations(order.getDriverId(), processOperationsWarpper);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
}
if(50 >= wgs84 && 12 > (null == num ? 0 : num)){
Integer integer = map.get(order.getId().toString());
--
Gitblit v1.7.1