From 7ed6489395475fc41d33914dfcc940b75ff65101 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 10 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
index fce3673..e966706 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
@@ -28,6 +28,7 @@
import java.time.LocalDate;
import java.time.Period;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -130,7 +131,15 @@
}
model.addAttribute("allList",list);
List<List<String>> list1 = new ArrayList<>();
+ AtomicInteger count = new AtomicInteger(0);
for (TDriver tDriver : onLineDriver) {
+
+ String value1 = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ String value2 = redisUtil.getValue(value1);
+ if(ToolUtil.isNotEmpty(value2)){
+ count.addAndGet(1);
+ }
+
List<String> obj = new ArrayList<>(3);
String value = redisUtil.getValue("DRIVER" + tDriver.getId());
if(ToolUtil.isEmpty(value)){
@@ -141,7 +150,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
- model.addAttribute("onLineDriverCount",list1.size());
+ model.addAttribute("onLineDriverCount",count.get());
// 拿到所有在线司机地址
model.addAttribute("onLineDriver",list1);
return PREFIX + "tHomePageMap.html";
@@ -150,7 +159,7 @@
@RequestMapping("/getMap")
@ResponseBody
public Object getMap(Integer agentId,Integer type,Model model) {
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
Integer roleType = ShiroKit.getUser().getRoleType();
if(roleType == 3 && Objects.nonNull(objectId)){
agentId = objectId;
@@ -183,8 +192,12 @@
|| order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode())
|| order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
// 驾龄
- Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
- tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ if(Objects.nonNull(tDriver.getFirstCertificateTime())){
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ }else {
+ tOrderServerResp.setDrivingExperience(0);
+ }
// 代驾次数
tOrderServerResp.setValetDrivingCount(collect.size());
// 行驶时间
@@ -199,8 +212,12 @@
}
tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
// 行驶里程
- int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
- tOrderServerResp.setMileageTraveled(sum/1000);
+ if(CollectionUtils.isEmpty(collect)){
+ tOrderServerResp.setMileageTraveled(0);
+ }else {
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
+ }
}
map.put("serverList",orderServerRespList);
// 查询今天所有订单
@@ -254,8 +271,12 @@
|| order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode())
|| order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
// 驾龄
- Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
- tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ if(Objects.nonNull(tDriver.getFirstCertificateTime())){
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ }else {
+ tOrderServerResp.setDrivingExperience(0);
+ }
// 代驾次数
tOrderServerResp.setValetDrivingCount(collect.size());
// 行驶时间
@@ -270,8 +291,12 @@
}
tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
// 行驶里程
- int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
- tOrderServerResp.setMileageTraveled(sum/1000);
+ if(CollectionUtils.isEmpty(collect)){
+ tOrderServerResp.setMileageTraveled(0);
+ }else {
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
+ }
}
map.put("serverList",orderServerRespList);
@@ -319,11 +344,43 @@
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询服务中的订单列表
List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
+ List<TOrder> orderList = tOrderService.selectList(new EntityWrapper<TOrder>());
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
tOrderServerResp.setAvatar(tDriver.getAvatar());
tOrderServerResp.setDriverName(tDriver.getName());
+ List<TOrder> collect = orderList.stream().filter(order -> tDriver.getId().equals(order.getDriverId()) &&
+ (order.getState().equals(OrderStateEnum.WAIT_PAY.getCode())
+ || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode())
+ || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
+ // 驾龄
+ if(Objects.nonNull(tDriver.getFirstCertificateTime())){
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ }else {
+ tOrderServerResp.setDrivingExperience(0);
+ }
+ // 代驾次数
+ tOrderServerResp.setValetDrivingCount(collect.size());
+ // 行驶时间
+ long goTime = 0;
+ for (TOrder tOrder : collect) {
+ // 下车时间
+ Date getoffTime = tOrder.getGetoffTime();
+ // 上车时间
+ Date boardingTime = tOrder.getBoardingTime();
+ long minutes = Duration.between(DateUtil.dateToLocalDateTime(getoffTime), DateUtil.dateToLocalDateTime(boardingTime)).toMinutes();
+ goTime += Math.abs(minutes);
+ }
+ tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+ // 行驶里程
+ if(CollectionUtils.isEmpty(collect)){
+ tOrderServerResp.setMileageTraveled(0);
+ }else {
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
+ }
}
map.put("serverList",orderServerRespList);
}else {
@@ -331,11 +388,43 @@
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询服务中的订单列表
List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
+ List<TOrder> orderList = tOrderService.selectList(new EntityWrapper<TOrder>());
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
tOrderServerResp.setAvatar(tDriver.getAvatar());
tOrderServerResp.setDriverName(tDriver.getName());
+ List<TOrder> collect = orderList.stream().filter(order -> tDriver.getId().equals(order.getDriverId()) &&
+ (order.getState().equals(OrderStateEnum.WAIT_PAY.getCode())
+ || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode())
+ || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
+ // 驾龄
+ if(Objects.nonNull(tDriver.getFirstCertificateTime())){
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ }else {
+ tOrderServerResp.setDrivingExperience(0);
+ }
+ // 代驾次数
+ tOrderServerResp.setValetDrivingCount(collect.size());
+ // 行驶时间
+ long goTime = 0;
+ for (TOrder tOrder : collect) {
+ // 下车时间
+ Date getoffTime = tOrder.getGetoffTime();
+ // 上车时间
+ Date boardingTime = tOrder.getBoardingTime();
+ long minutes = Duration.between(DateUtil.dateToLocalDateTime(getoffTime), DateUtil.dateToLocalDateTime(boardingTime)).toMinutes();
+ goTime += Math.abs(minutes);
+ }
+ tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+ // 行驶里程
+ if(CollectionUtils.isEmpty(collect)){
+ tOrderServerResp.setMileageTraveled(0);
+ }else {
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
+ }
}
map.put("serverList",orderServerRespList);
}
--
Gitblit v1.7.1