From 031c21e5014edce49894eabb748a36847253fb2f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 23:23:06 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java | 262 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 234 insertions(+), 28 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 f72a8aa..ab3dabf 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
@@ -1,19 +1,27 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.GunsApplication;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.state.Order;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.controller.resp.TOrderServerResp;
+import com.stylefeng.guns.modular.system.controller.util.HttpUtils;
import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
import com.stylefeng.guns.modular.system.enums.StatusEnum;
import com.stylefeng.guns.modular.system.model.TAgent;
import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TDriverWork;
import com.stylefeng.guns.modular.system.model.TOrder;
+import com.stylefeng.guns.modular.system.pojo.GaoDePoJo;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -23,8 +31,11 @@
import org.springframework.web.bind.annotation.ResponseBody;
import java.text.SimpleDateFormat;
+import java.time.Duration;
import java.time.LocalDate;
+import java.time.Period;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -36,6 +47,8 @@
@Controller
@RequestMapping("/tHomePage")
public class THomePageController extends BaseController {
+
+ private final static Logger log = LoggerFactory.getLogger(THomePageController.class);
@Autowired
private IUserService userService;
@@ -49,6 +62,10 @@
private ITRevenueService tRevenueService;
@Autowired
private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private GaoDePoJo gaoDePoJo;
+ @Autowired
+ private HttpUtils httpUtils;
@Autowired
private RedisUtil redisUtil;
@@ -71,24 +88,52 @@
.ne("status", StatusEnum.DELETE.getCode())
.ne("principal",""));
model.addAttribute("agentList",agentList);
+ // 查询广东省广州市的地址解析
+ Map<String, String> map = geocode("广东省广州市");
+ model.addAttribute("addressLon",map.get("addressLon"));
+ model.addAttribute("addressLat",map.get("addressLat"));
// 查询广东全区域数据 查询广东所有的代理商
List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>()
.eq("provinceCode", "440000"));
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
- .in("agentId", ids)
- .eq("serverStatus", 2));
+ .in("agentId", ids));
+ List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
+ List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
+ tOrderService.getDataStatisticsCountByIds(allIds,model);
- model.addAttribute("onLineDriverCount",onLineDriver.size());
- tOrderService.getDataStatisticsCountByIds(ids,model);
// 查询服务中的订单列表
- List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
+ List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
+ 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());
+ // 驾龄
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ // 代驾次数
+ tOrderServerResp.setValetDrivingCount(collect.size());
+ // 行驶时间
+ long goTime = 0;
+ for (TOrder tOrder : collect) {
+ // 下车时间
+ Date getoffTime = tOrder.getGetoffTime();
+ // 上车时间
+ Date boardingTime = tOrder.getBoardingTime();
+ long minutes = Duration.between(DateUtil.dateToLocalDate(getoffTime), DateUtil.dateToLocalDate(boardingTime)).toMinutes();
+ goTime += Math.abs(minutes);
+ }
+ tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+ // 行驶里程
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
}
model.addAttribute("serverList",orderServerRespList);
// 查询今天所有订单
@@ -102,8 +147,16 @@
list.add(obj);
}
model.addAttribute("allList",list);
- List<List<String>> list1 = new ArrayList<>(allList.size());
+ 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)){
@@ -114,6 +167,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
+ model.addAttribute("onLineDriverCount",count.get());
// 拿到所有在线司机地址
model.addAttribute("onLineDriver",list1);
return PREFIX + "tHomePageMap.html";
@@ -122,7 +176,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;
@@ -135,32 +189,57 @@
map.put("agentList",agentList);
if(Objects.nonNull(agentId)){
+ // 查询当前代理商
+ TAgent tAgent = tAgentService.selectById(agentId);
+ Map<String, String> mapAddress = geocode(tAgent.getProvinceName()+tAgent.getCityName());
+ map.put("addressLon",mapAddress.get("addressLon"));
+ map.put("addressLat",mapAddress.get("addressLat"));
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
- .eq("agentId", agentId)
- .eq("serverStatus", 2));
- map.put("onLineDriverCount",onLineDriver.size());
-// tOrderService.getDataStatisticsCountGetMap(agentId,map);
-// // 查询服务中的订单列表
-// List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerList(agentId);
-// // 查询司机
-// for (TOrderServerResp tOrderServerResp : orderServerRespList) {
-// TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
-// tOrderServerResp.setAvatar(tDriver.getAvatar());
-// tOrderServerResp.setDriverName(tDriver.getName());
-// }
-// map.put("serverList",orderServerRespList);
+ .eq("agentId", agentId));
List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
tOrderService.getDataStatisticsCountByIdsGetMap(allIds,map);
// 查询服务中的订单列表
List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
+ 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);
// 查询今天所有订单
@@ -174,7 +253,7 @@
list.add(obj);
}
map.put("allList",list);
- List<List<String>> list1 = new ArrayList<>(allList.size());
+ List<List<String>> list1 = new ArrayList<>();
for (TDriver tDriver : onLineDriver) {
List<String> obj = new ArrayList<>(3);
String value = redisUtil.getValue("DRIVER" + tDriver.getId());
@@ -186,6 +265,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
+ map.put("onLineDriverCount",list1.size());
// 拿到所有在线司机地址
map.put("onLineDriver",list1);
}else {
@@ -194,10 +274,11 @@
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
- .in("agentId", ids)
- .eq("serverStatus", 2));
+ .in("agentId", ids));
- map.put("onLineDriverCount",onLineDriver.size());
+ Map<String, String> mapAddress = geocode("广东省广州市");
+ map.put("addressLon",mapAddress.get("addressLon"));
+ map.put("addressLat",mapAddress.get("addressLat"));
List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
@@ -205,13 +286,46 @@
// 查询服务中的订单列表
List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
+ 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);
+
// 查询今天所有订单
List<TOrder> allList = tOrderService.getDataStatisticsAllListByIds(allIds,type);
List<List<String>> list = new ArrayList<>(allList.size());
@@ -223,7 +337,7 @@
list.add(obj);
}
map.put("allList",list);
- List<List<String>> list1 = new ArrayList<>(allList.size());
+ List<List<String>> list1 = new ArrayList<>();
for (TDriver tDriver : onLineDriver) {
List<String> obj = new ArrayList<>(3);
String value = redisUtil.getValue("DRIVER" + tDriver.getId());
@@ -235,6 +349,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
+ map.put("onLineDriverCount",list1.size());
// 拿到所有在线司机地址
map.put("onLineDriver",list1);
}
@@ -251,13 +366,47 @@
}
HashMap<String, Object> map = new HashMap<>();
if(Objects.nonNull(agentId)){
+ List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>());
+ List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询服务中的订单列表
- List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerList(agentId);
+ 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 {
@@ -265,11 +414,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);
}
@@ -472,8 +653,7 @@
}else {
// 业绩排名 performanceTable
// 查询广东全区域数据 查询广东所有的代理商
- List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>()
- .eq("provinceCode", "440000"));
+ List<TAgent> tAgentList = tAgentService.selectList(null);
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
if (1 == type){
// 单量
@@ -514,4 +694,30 @@
return map;
}
+ private Map<String,String> geocode(String address){
+ Map<String,String> map = new HashMap<>(2);
+ try {
+ String url = "https://restapi.amap.com/v3/geocode/geo?address=" + address + "&key=" + gaoDePoJo.getKey();
+ url = url.trim().replace("#", "").replace(" ", "");
+ String result = httpUtils.get(url);
+ log.info("地址解析结果:{}", result);
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ if (jsonObject.getString("status").equals("1")) {
+ String geocodes = jsonObject.getString("geocodes");
+ JSONArray objects = JSONObject.parseArray(geocodes);
+ String string = objects.getString(0);
+ JSONObject geocodesObject = JSONObject.parseObject(string);
+ log.info("地址数据:{}", geocodesObject);
+ String location = geocodesObject.getString("location");
+ String[] split = location.split(",");
+ map.put("addressLon",split[0]);
+ map.put("addressLat",split[1]);
+ }
+ } catch (Exception e) {
+ log.error("解析地址失败============:{}", e.getMessage());
+ e.printStackTrace();
+ }
+ return map;
+ }
+
}
--
Gitblit v1.7.1