#

luxiaotao1123

2025-01-08 3e76332bf67de55be83a8ef4cd893a2b7b72b7d9

#

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

@@ -23,8 +23,10 @@
import javax.annotation.PreDestroy;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

/**
 * Created by vincent on 10/14/2024
@@ -72,6 +74,10 @@
        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>()
//                .eq(Agv::getStatus, 1)
        );

        Map<String, List<String>> codeDataListMap = mapService.queryCodeListFromDynamicNode(null
                , agvList.stream().map(Agv::getUuid).collect(Collectors.toSet()));

        for (Agv agv : agvList) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
@@ -90,7 +96,7 @@
            vo.setBattery(agvDetail.getSoc());
            vo.setError(agvDetail.realError());

            vo.setDynamicRoute(mapService.queryCodeListFromDynamicNode(null, agv.getUuid()));
            vo.setDynamicRoute(codeDataListMap.get(agv.getUuid()));

            agvVos.add(vo);
        }

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

@@ -405,4 +405,39 @@
                .collect(Collectors.toList());
    }

    public Map<String, List<String>> queryCodeListFromDynamicNode(Integer lev, Set<String> vehicles) {
        if (Cools.isEmpty(vehicles)) {
            return new HashMap<>();
        }
        lev = Optional.ofNullable(lev).orElse(MapDataDispatcher.MAP_DEFAULT_LEV);

        DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
        String[][] codeMatrix = mapDataDispatcher.getCodeMatrix(lev);

        Map<String, List<SortCodeDto>> map = new HashMap<>(vehicles.size());

        for (int i = 0; i < codeMatrix.length; i++) {
            for (int j = 0; j < codeMatrix[i].length; j++) {
                DynamicNode dynamicNode = dynamicMatrix[i][j];
                String vehicle = dynamicNode.getVehicle();

                if (vehicles.contains(vehicle)) {
                    int serial = dynamicNode.getSerial();
                    map.computeIfAbsent(vehicle, k -> new ArrayList<>()).add(new SortCodeDto(codeMatrix[i][j], serial));
                }
            }
        }

        Map<String, List<String>> result = new HashMap<>(vehicles.size());
        for (Map.Entry<String, List<SortCodeDto>> entry : map.entrySet()) {
            List<String> codeDataList = entry.getValue().stream()
                    .sorted(Comparator.comparingInt(SortCodeDto::getSerial))
                    .map(SortCodeDto::getCode)
                    .collect(Collectors.toList());
            result.put(entry.getKey(), codeDataList);
        }

        return result;
    }

}