BUG修改

xuhy

2023-05-16 f0b4d0e6bc47a18f4e10ca4c007dcaa01c9c9647

 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,50 @@
        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());
                // 驾龄
                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);
            // 查询今天所有订单
@@ -149,7 +222,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 +234,7 @@
                obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
                list1.add(obj);
            }
            map.put("onLineDriverCount",list1.size());
            // 拿到所有在线司机地址
            map.put("onLineDriver",list1);
        }else {
@@ -169,22 +243,56 @@
            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());
                // 驾龄
                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(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 +302,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 +314,7 @@
                obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
                list1.add(obj);
            }
            map.put("onLineDriverCount",list1.size());
            // 拿到所有在线司机地址
            map.put("onLineDriver",list1);
        }
@@ -215,28 +324,98 @@
    @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<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);
        }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);
            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 {
            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);
            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);
        }
@@ -248,6 +427,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 +501,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 +539,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 +566,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 +594,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 +638,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)){
            // 统计司机数