From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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..7190d0f 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()));
@@ -532,6 +541,7 @@
map.put("cancelOrder",red);
return ResultUtil.success(map);
}
+
/**
@@ -1110,8 +1120,8 @@
int orderNum = orderService.selectCount(wrapper);
map.put("orderNum",orderNum);
// 有效时长
- int okTime = this.baseMapper.getTime(sTime,eTime,uid);
- map.put("okTime",okTime);
+ Integer okTime = this.baseMapper.getTime(sTime,eTime,uid);
+ map.put("okTime",okTime==null?0:okTime);
wrapperOne.eq("inviterType",2);
wrapperOne.eq("inviterId",uid);
int userNum = appUserService.selectCount(wrapperOne);
--
Gitblit v1.7.1