#

luxiaotao1123

2024-12-09 69facf40120e294e46db6655d6fa59cf56713733

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/DigitalTwinDataScheduler.java

@@ -12,7 +12,6 @@
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.Comparator;
import java.util.HashMap;
@@ -22,7 +21,7 @@
/**
 * Created by vincent on 4/11/2024
 */
@Component
//@Component
public class DigitalTwinDataScheduler {

    @Autowired

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/config/MapDataConfig.java

@@ -21,11 +21,13 @@
    @Bean
    public MapDataDispatcher getMapDataDispatcher() {
        MapDataDispatcher dispatcher = new MapDataDispatcher(codeService, routeService);
        dispatcher.getCodeMatrix(null);
        dispatcher.getMapMatrix(null, null);
        dispatcher.getTurnMatrix(null);
        dispatcher.getCdaMatrix(null);
        dispatcher.getDynamicMatrix(null);
        String[][] codeMatrix = dispatcher.getCodeMatrix(null);
        if (codeMatrix.length > 0) {
            dispatcher.getMapMatrix(null, null);
            dispatcher.getTurnMatrix(null);
            dispatcher.getCdaMatrix(null);
            dispatcher.getDynamicMatrix(null);
        }
        return dispatcher;
    }


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

@@ -160,7 +160,10 @@
            vo.setVol(String.valueOf(agvDetail.getVol()));
            vo.setSoc(String.valueOf(agvDetail.getSoc()));
            vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1);
            vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
            Code code = codeService.getById(agvDetail.getRecentCode());
            if (null != code) {
                vo.setCode(code.getData());
            }
            vo.setDirection(agvDetail.getAgvAngle());
            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
            vo.setPatrol(patrolService.isPatrolling(agvNo));