From 4e8951a439c03e87568789cedeb62033884412db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java |  173 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 151 insertions(+), 22 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 99cbd75..fce3673 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
@@ -10,6 +10,7 @@
 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.service.*;
 import com.stylefeng.guns.modular.system.util.DateUtil;
@@ -23,7 +24,9 @@
 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.stream.Collectors;
 
@@ -59,6 +62,13 @@
      */
     @RequestMapping("/map")
     public String map(Integer agentId,Integer type,Model model) {
+
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
+
         // 查询所有代理商
         List<TAgent> agentList = tAgentService.selectList(new EntityWrapper<TAgent>()
                 .ne("status", StatusEnum.DELETE.getCode())
@@ -70,18 +80,42 @@
         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);
         // 查询今天所有订单
@@ -95,7 +129,7 @@
             list.add(obj);
         }
         model.addAttribute("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());
@@ -107,6 +141,7 @@
             obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
             list1.add(obj);
         }
+        model.addAttribute("onLineDriverCount",list1.size());
         // 拿到所有在线司机地址
         model.addAttribute("onLineDriver",list1);
         return PREFIX + "tHomePageMap.html";
@@ -115,6 +150,11 @@
     @RequestMapping("/getMap")
     @ResponseBody
     public Object getMap(Integer agentId,Integer type,Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         HashMap<String, Object> map = new HashMap<>();
         // 查询所有代理商
         List<TAgent> agentList = tAgentService.selectList(new EntityWrapper<TAgent>()
@@ -125,17 +165,42 @@
         if(Objects.nonNull(agentId)){
             // 查询统计在线司机,待接单,服务中,已完成,已取消
             List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
-                    .eq("agentId", agentId)
-                    .eq("serverStatus", 2));
-            map.put("onLineDriverCount",onLineDriver.size());
-            tOrderService.getDataStatisticsCountGetMap(agentId,map);
+                    .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.getDataStatisticsServerList(agentId);
+            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.dateToLocalDateTime(getoffTime), DateUtil.dateToLocalDateTime(boardingTime)).toMinutes();
+                    goTime += Math.abs(minutes);
+                }
+                tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+                // 行驶里程
+                int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+                tOrderServerResp.setMileageTraveled(sum/1000);
             }
             map.put("serverList",orderServerRespList);
             // 查询今天所有订单
@@ -149,7 +214,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());
@@ -161,6 +226,7 @@
                 obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
                 list1.add(obj);
             }
+            map.put("onLineDriverCount",list1.size());
             // 拿到所有在线司机地址
             map.put("onLineDriver",list1);
         }else {
@@ -169,22 +235,48 @@
             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());
-            tOrderService.getDataStatisticsCountByIdsGetMap(ids,map);
+            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(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.dateToLocalDateTime(getoffTime), DateUtil.dateToLocalDateTime(boardingTime)).toMinutes();
+                    goTime += Math.abs(minutes);
+                }
+                tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+                // 行驶里程
+                int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+                tOrderServerResp.setMileageTraveled(sum/1000);
             }
             map.put("serverList",orderServerRespList);
+
             // 查询今天所有订单
-            List<TOrder> allList = tOrderService.getDataStatisticsAllListByIds(ids,type);
+            List<TOrder> allList = tOrderService.getDataStatisticsAllListByIds(allIds,type);
             List<List<String>> list = new ArrayList<>(allList.size());
             for (TOrder tOrder : allList) {
                 List<String> obj = new ArrayList<>(3);
@@ -194,7 +286,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());
@@ -206,6 +298,7 @@
                 obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
                 list1.add(obj);
             }
+            map.put("onLineDriverCount",list1.size());
             // 拿到所有在线司机地址
             map.put("onLineDriver",list1);
         }
@@ -215,10 +308,17 @@
     @RequestMapping("/getServerOrder")
     @ResponseBody
     public Object getServerOrder(Integer agentId,Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         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);
             // 查询司机
             for (TOrderServerResp tOrderServerResp : orderServerRespList) {
                 TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
@@ -227,8 +327,7 @@
             }
             map.put("serverList",orderServerRespList);
         }else {
-            List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>()
-                    .eq("provinceCode", "440000"));
+            List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>());
             List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
             // 查询服务中的订单列表
             List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
@@ -248,6 +347,11 @@
      */
     @RequestMapping("/statistics")
     public String statistics(Integer agentId,String dayDate,String yearDate,String monthDate,Integer type,Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         if(Objects.isNull(type)){
             type = 1;
         }
@@ -317,6 +421,11 @@
     @RequestMapping("/statisticsByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsByAgentId(Integer agentId, String dayDate, String yearDate, String monthDate, Integer type, Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         Map<String, Object> map = new HashMap<>();
         if(Objects.nonNull(agentId)){
             // 统计代理商
@@ -350,6 +459,11 @@
     @RequestMapping("/statisticsMonthByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsMonthByAgentId(Integer agentId, String dayDate,Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         dayDate = new SimpleDateFormat("yyyy-MM").format(new Date());
         Map<String, Object> map = new HashMap<>();
         if(Objects.nonNull(agentId)){
@@ -372,6 +486,11 @@
     @RequestMapping("/statisticsYearByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsYearByAgentId(Integer agentId, String yearDate,Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         if(!StringUtils.hasLength(yearDate)){
             yearDate = new SimpleDateFormat("yyyy").format(new Date());
         }
@@ -395,6 +514,11 @@
     @RequestMapping("/statisticsOrderByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsOrderByAgentId(Integer agentId, String monthDate,Integer type,Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         if(Objects.isNull(type)){
             type = 1;
         }
@@ -434,6 +558,11 @@
     @RequestMapping("/statisticsDriverByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsDriverByAgentId(Integer agentId,Model model) {
+        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = ShiroKit.getUser().getRoleType();
+        if(roleType == 3 && Objects.nonNull(objectId)){
+            agentId = objectId;
+        }
         Map<String, Object> map = new HashMap<>();
         if(Objects.nonNull(agentId)){
             // 统计司机数

--
Gitblit v1.7.1