Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java

@@ -423,7 +423,8 @@
        }
        List<TDriver> tDrivers = tDriverService.selectList(ne);
        Map<String, Object> map = new HashMap<>();
        List<Object> list = new ArrayList<>();
        List<Object> list1 = new ArrayList<>();
        List<Object> list2 = new ArrayList<>();
        for(TDriver tDriver : tDrivers){
            Map<String, Object> d = new HashMap<>();
            String value = redisUtil.getValue("DRIVER" + tDriver.getId());
@@ -433,18 +434,28 @@
            d.put("driver", tDriver);
            d.put("lon", value.split(",")[0]);
            d.put("lat", value.split(",")[1]);
            list.add(d);
            if(tDriver.getState() == 2){
                list1.add(d);
            }else{
                list2.add(d);
            }
        }
        map.put("driver", list);
        map.put("driver1", list1);
        map.put("driver2", list2);

        Map<String, Object> map2 = new HashMap<>();
        String today = DateUtil.format(new Date(), "yyyy-MM-dd");
        Wrapper<TOrderPrivateCar> eq = new EntityWrapper<TOrderPrivateCar>().eq("state", 1).eq("isDelete", 1).ge("insertTime",DateUtil.parse(today,"yyyy-MM-dd"));
        if(companyId != null){
            eq.eq("companyId", companyId);
        }
        Wrapper<TOrderLogistics> eq1 = new EntityWrapper<TOrderLogistics>().eq("state", 1).eq("isDelete", 1).ge("insertTime",DateUtil.parse(today,"yyyy-MM-dd"));
        if(companyId != null){
            eq1.eq("companyId", companyId);
        }
        List<TOrderPrivateCar> tOrderPrivateCars=tOrderPrivateCarService.selectList(eq);
        list = new ArrayList<>();
        List<TOrderLogistics> orderLogistics=itOrderLogisticsService.selectList(eq1);
        List<Map<String, Object>> privateCarOrderList = new ArrayList<>();
        List<Map<String, Object>> logisticsOrderList = new ArrayList<>();
        for(TOrderPrivateCar t : tOrderPrivateCars){
            Map<String, Object> map1 = new HashMap<>();
            map1.put("start", t.getStartAddress());
@@ -452,10 +463,21 @@
            map1.put("travelTime", t.getTravelTime());
            map1.put("carModel", "");
            map1.put("num", 1);
            list.add(map1);
            privateCarOrderList.add(map1);
        }
        map2.put("privateCar", list);
        map.put("order", map2);
        for(TOrderLogistics t : orderLogistics){
            Map<String, Object> map1 = new HashMap<>();
            map1.put("start", t.getStartAddress());
            map1.put("end", t.getEndAddress());
            map1.put("travelTime", t.getTravelTime());
            map1.put("carModel", "");
            map1.put("num", 1);
            logisticsOrderList.add(map1);
        }
        Map<String, Object> map1 = new HashMap<>();
        map1.put("zhuanche", privateCarOrderList);
        map1.put("kuacheng", logisticsOrderList);
        map.put("order", map1);

        return map;
    }
@@ -464,9 +486,16 @@
    @ResponseBody
    @PostMapping("/getAllOrder")
    public Object getAllOrder(){
        List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().eq("isDelete", 1));
        List<TOrderPrivateCar> orderPrivateCars = tOrderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>().eq("isDelete", 1));
        List<TOrderLogistics> orderLogistics = itOrderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>().eq("isDelete", 1));
        List list = new ArrayList<>();
        for(TOrderTaxi t : tOrderTaxis){
        for(TOrderPrivateCar t : orderPrivateCars){
            Map<String, Object> map = new HashMap<>();
            map.put("lon", t.getStartLon());
            map.put("lat", t.getStartLat());
            list.add(map);
        }
        for(TOrderLogistics t : orderLogistics){
            Map<String, Object> map = new HashMap<>();
            map.put("lon", t.getStartLon());
            map.put("lat", t.getStartLat());