From dceeb9c3063ff9bbeb408dc14e036427fef6045f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 八月 2023 11:13:41 +0800
Subject: [PATCH] 新增加司机端接口
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 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 7190d0f..1396d57 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
@@ -507,6 +507,9 @@
locations.forEach(s -> {
int i=0;
Driver driver = this.baseMapper.selectById(s.getDriverId());
+ if(null == driver){
+ return;
+ }
i = driver.getServerStatus();
if(driver.getServerStatus()==2){
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("driverId", s.getDriverId()).eq("state", 102));
@@ -627,7 +630,15 @@
Integer num3 = jsonObject.getInteger("num3");//每小时增加积分
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
long start = sdf.parse(sdf1.format(new Date()) + " " + num1 + ":00").getTime();
- long end = sdf.parse(sdf1.format(new Date()) + " " + num2 + ":00").getTime();
+ Date e = sdf.parse(sdf1.format(new Date()) + " " + num2 + ":00");
+ long end = e.getTime();
+ if(start > end){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(e);
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ end = calendar.getTimeInMillis();
+ }
+
long l = System.currentTimeMillis();
if(start <= l && end > l){
Driver driver = this.selectById(driverId);
@@ -638,24 +649,25 @@
}
String today = sdf1.format(new Date());
String[] s = value.split("_");
- if(!today.equals(s[1])){
- //修改在线时长记录
- DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).eq("DATE_FORMAT(`day`, '%Y-%m-%d')", s[1]));
- if(null != driverOnlineTime){
- driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
- driverOnlineTimeService.updateById(driverOnlineTime);
- }else{
- driverOnlineTime = new DriverOnlineTime();
- driverOnlineTime.setDriverId(driverId);
- driverOnlineTime.setDay(sdf1.parse(s[1]));
- driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
- driverOnlineTimeService.insert(driverOnlineTime);
- }
- driver.setOnlineTime(new BigInteger(s[0]));
- this.updateById(driver);
+
+ //修改在线时长记录
+ DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).last(" and DATE_FORMAT(`day`, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')"));
+ if(null != driverOnlineTime){
+ driverOnlineTime.setOnlineTime(driverOnlineTime.getOnlineTime().add(new BigInteger("5")));
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.updateById(driverOnlineTime);
+ }else{
+ driverOnlineTime = new DriverOnlineTime();
+ driverOnlineTime.setDriverId(driverId);
+ driverOnlineTime.setDay(new Date());
+ driverOnlineTime.setOnlineTime(new BigInteger("0"));
+ driverOnlineTimeService.insert(driverOnlineTime);
redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
return;
}
+ driver.setOnlineTime(driver.getOnlineTime().add(new BigInteger("5")));
+ this.updateById(driver);
+
Integer second = Integer.valueOf(s[0]) + 5;
Integer time = Integer.valueOf(s[2]);
@@ -674,19 +686,6 @@
driver.setOnlineTime(new BigInteger(s[0]));
this.updateById(driver);
time++;
-
- //修改在线时长记录
- DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).eq("DATE_FORMAT(`day`, '%Y-%m-%d')", s[1]));
- if(null != driverOnlineTime){
- driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
- driverOnlineTimeService.updateById(driverOnlineTime);
- }else{
- driverOnlineTime = new DriverOnlineTime();
- driverOnlineTime.setDriverId(driverId);
- driverOnlineTime.setDay(sdf1.parse(s[1]));
- driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
- driverOnlineTimeService.insert(driverOnlineTime);
- }
}
redisUtil.setStrValue("ONLINE" + driverId, second + "_" + s[1] + "_" + time);
}
--
Gitblit v1.7.1