同步后台代码

puzhibing

2023-06-01 c4a098e3f88bc5071e36b92b9e5dcceb51129957

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

@@ -147,7 +147,7 @@
        for(TDriver driver : tDrivers){
            keys += "DRIVER" + driver.getId() + ",";
        }
        String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
        String value = redisUtil.getValue(keys.substring(0, keys.length() - 1));
        JSONArray jsonArray = JSON.parseArray(value);
        int size = driverOnlineService.queryOnlineDriverCount(null, null);
        map1.put("netcardriver", size);  //在线司机
@@ -471,18 +471,18 @@
    public Object getDriverInfo(Integer driverId){
        Map<String, Object> map = new HashMap<>();
        TDriver tDriver = tDriverService.selectById(driverId);
        TCar tCar = tCarService.selectById(tDriver.getCarId());
//        TCar tCar = tCarService.selectById(tDriver.getCarId());
        TCarBrand tCarBrand = null;
        TCarModel tCarModel = null;
        if(null != tCar){
            tCarBrand = carBrandService.selectById(tCar.getCarBrandId());
            tCarModel = carModelService.selectById(tCar.getCarModelId());
        }
//        if(null != tCar){
//            tCarBrand = carBrandService.selectById(tCar.getCarBrandId());
//            tCarModel = carModelService.selectById(tCar.getCarModelId());
//        }
        Integer[] states = new Integer[]{2, 3, 4, 5, 6, 11};
        Wrapper<TOrderTaxi> state4 = new EntityWrapper<TOrderTaxi>().in("state", states).eq("driverId", driverId).eq("isDelete", 1);
        List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(state4);
        map.put("netcarDriver", tDriver);
        map.put("netcar", tCar);
//        map.put("netcar", tCar);
        map.put("carBrand", null != tCarBrand ? tCarBrand.getName() : "");
        map.put("carModel", null != tCarModel ? tCarModel.getName() : "");
        map.put("order", tOrderTaxis);