1

zhang

2025-07-03 13ea8b334572c2423abb8d156fd8428f8d074172

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java

@@ -44,8 +44,6 @@
    @Autowired
    private WebsocketService websocketService;
    @Autowired
    private TrafficService trafficService;
    @Autowired
    private MapService mapService;
    @Autowired
    private ThreadPoolRegulator threadPoolRegulator;
@@ -84,9 +82,10 @@
            AGV_12_UP agv_12_up = (AGV_12_UP) msgBody;

            // unlock path
            threadPoolRegulator.getInstance().execute(() -> {
                mapService.unlockPath(protocol.getAgvNo(), agv_12_up.getQrCode());
            });
            mapService.unlockPath(protocol.getAgvNo(), agv_12_up.getQrCode());
//            threadPoolRegulator.getInstance().execute(() -> {
//
//            });
            // finish jam
            threadPoolRegulator.getInstance().execute(() -> jamService.checkIfFinish(agvId, agv_12_up.getQrCode()));

@@ -153,7 +152,7 @@
    private void sync(AGV_12_UP mesBody, AgvDetail detail) {
        detail.setStatus(mesBody.getStatus());

        Code code = codeService.selectByData(mesBody.getQrCode());
        Code code = codeService.getCacheByData(mesBody.getQrCode());
        if (null != code) {
            detail.setCode(code.getId());
            detail.setLastCode(null);
@@ -201,7 +200,7 @@
    private void sync(AGV_13_UP mesBody, AgvDetail detail) {
        detail.setStatus(mesBody.getStatus());

        Code code = codeService.selectByData(mesBody.getQrCode());
        Code code = codeService.getCacheByData(mesBody.getQrCode());
        if (null != code) {

            if (!detail.getAgvStatus().equals(AgvStatusType.CHARGE)) {