#

vincentlu

2025-12-19 44b9055cb993157bd26ba8a370719fa9080731f4

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

@@ -44,19 +44,6 @@
    @Autowired
    private MapDataDispatcher mapDataDispatcher;

//    @PreAuthorize("hasAuthority('manager:agv:list')")
//    @PostMapping("/agv/page")
//    public R page(@RequestBody Map<String, Object> map) {
//        BaseParam baseParam = buildParam(map, BaseParam.class);
//        PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class);
//        PageParam<Agv, BaseParam> page = agvService.page(pageParam, pageParam.buildWrapper(true));
//        for (Agv agv : page.getRecords()) {
//            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
//            agv.setAgvDetail(agvDetail);
//        }
//        return R.ok().add(page);
//    }

    @PreAuthorize("hasAuthority('manager:agv:list')")
    @PostMapping("/agv/page")
    public R page(@RequestBody Map<String, Object> map) {
@@ -87,12 +74,11 @@
        Agv agv = agvService.getById(id);
        if (null != agv) {
            agv.setOnline(agvService.judgeOnline(agv.getId()));
            if (agv.getUuid().equals("2")) { agv.setOnline(true); }
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            if (null != agvDetail) {
                agv.setAgvDetail(agvDetail);
            }
            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
            AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
            if (null != agvModel) {
                agv.setAgvModelData(agvModel);
            }
@@ -132,27 +118,19 @@
    @OperationLog("Update Agv")
    @PostMapping("/agv/update")
    public R update(@RequestBody Agv agv) {
        if (agvService.count(new LambdaQueryWrapper<Agv>()
                .eq(Agv::getUuid, agv.getUuid())
                .ne(Agv::getId, agv.getId())) > 0) {
            return R.error("Update Fail");
        }
        agv.setUpdateBy(getLoginUserId());
        agv.setUpdateTime(new Date());
        if (!agvService.updateById(agv)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(agv);
        return R.ok("Update Success").add(agvService.modify(agv, getLoginUserId()));
    }

    @PreAuthorize("hasAuthority('manager:agv:remove')")
    @OperationLog("Delete Agv")
    @PostMapping("/agv/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!agvService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        Long userId = getLoginUserId();
        List<Long> agvIds = new ArrayList<>();
        for (Long agvId : ids) {
            agvIds.add(agvService.delete(agvId, userId));
        }
        return R.ok("Delete Success").add(ids);
        return R.ok("Delete Success").add(agvIds);
    }

    @PreAuthorize("hasAuthority('manager:agv:list')")