新增充电桩

zhang

2025-05-20 1313906bb1eb983d3beece810035e7fc28d6a92f

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java

@@ -54,14 +54,18 @@
        PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
        QueryWrapper<Bus> wrapper = pageParam.buildWrapper(true);
        if (hasCreateTimeDesc(pageParam.getOrders())) {
            wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
//            wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
        }
        PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);

        long taskCompleteSts = TaskStsType.COMPLETE.val();
        long taskCancelSts = TaskStsType.CANCEL.val();
        for (Bus record : page.getRecords()) {
            List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId()));
            if (!Cools.isEmpty(tasks)) {
                record.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
                record.setTasksNum(tasks.size());
                record.setTasksNum((int)tasks.stream().filter(task -> task.getTaskSts() != taskCompleteSts && task.getTaskSts() != taskCancelSts).count());
                record.setTasksNumTotal(tasks.size());
            }
        }
        return R.ok().add(page);
@@ -175,13 +179,16 @@
                taskService.cancel(task.getId(), getLoginUserId());
            }
        }
        bus.setBusSts(BusStsType.CANCEL.val());
        if (0 == taskService.count(new LambdaQueryWrapper<Task>().eq(Task::getBusId, bus.getId()).eq(Task::getTaskSts, TaskStsType.COMPLETE.val()))) {
            bus.setBusSts(BusStsType.CANCEL.val());
        } else {
            bus.setBusSts(BusStsType.FINISH.val());
        }
        bus.setUpdateTime(new Date());
        bus.setUpdateBy(getLoginUserId());
        if (!busService.updateById(bus)) {
            return R.error("Cancel Fail");
        }

        return R.ok("Cancel Success");
     }