#

vincentlu

2025-04-18 a957c1c914f6890c8a6a8c477495809b065fcbcf

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java

@@ -7,10 +7,7 @@
import com.zy.acs.manager.core.service.*;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.utils.RouteGenerator;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.FuncSta;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.FuncStaType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.*;
@@ -63,6 +60,8 @@
    private RouteGenerator routeGenerator;
    @Autowired
    private FuncStaService funcStaService;
    @Autowired
    private AgvModelService agvModelService;

    @RequestMapping(value = "/system/info", method = {RequestMethod.GET, RequestMethod.POST})
    public R systemInfo() {
@@ -138,7 +137,7 @@
                .eq(FuncSta::getType, FuncStaType.STANDBY.toString())
                .orderByAsc(FuncSta::getId));

        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val).orderByAsc(Agv::getId));
        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val).orderByDesc(Agv::getId));

        int size = Math.min(standbyFunStaList.size(), agvList.size());

@@ -149,11 +148,13 @@

            Agv agv = agvList.get(i);
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
            Double workDirection = agvModel.getWorkDirection();

            agvDetail.setPos(1);
            agvDetail.setCode(code.getId());
            agvDetail.setStatus(AgvStatusType.IDLE.val);
            agvDetail.setAgvAngle(90D);
            agvDetail.setAgvAngle(workDirection);
            agvDetail.setVol(5000);

            agvDetailService.updateById(agvDetail);