#

luxiaotao1123

2024-10-12 28647ecb12f0dc6558c0c299d99e9a450d97fa22

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

@@ -14,10 +14,8 @@
import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,6 +33,8 @@
    private AgvService agvService;
    @Autowired
    private AgvDetailService agvDetailService;
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private CodeService codeService;
    @Autowired
@@ -61,6 +61,7 @@
        PageResult<AgvResult> page = agvService.pageRel(pageParam);
        for (AgvResult result : page.getRecords()) {
            result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService, agvService);
            if (result.getUuid().equals("2")) { result.setOnline(true); }
        }
        return R.ok().add(page);
    }
@@ -82,10 +83,16 @@
    public R get(@PathVariable("id") Long id) {
        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());
            if (null != agvModel) {
                agv.setAgvModelData(agvModel);
            }
        }
        return R.ok().add(agv);
    }