#

vincentlu

2025-03-18 4c9169967a879b54c04b0754ab9830a5a6baa708

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/utils/RouteGenerator.java

@@ -30,6 +30,28 @@
    @Autowired
    private CodeGapService codeGapService;

    public static String generateRouteKey(String codeData0, String codeData1) {
        if (Cools.isEmpty(codeData0, codeData1)) {
            return null;
        }
        if (codeData0.compareTo(codeData1) < 0) {
            return codeData0 + "-" + codeData1;
        } else {
            return codeData1 + "-" + codeData0;
        }
    }

    public static String generateRouteCdaKey(int[] code0Cda, int[] code1Cda) {
        if (Cools.isEmpty(code0Cda, code1Cda)) {
            return null;
        }
        if (code0Cda[0] < code1Cda[0] || (code0Cda[0] == code1Cda[0] && code0Cda[1] < code1Cda[1])) {
            return code0Cda[0] + "," + code0Cda[1] + "-" + code1Cda[0] + "," + code1Cda[1];
        } else {
            return code1Cda[0] + "," + code1Cda[1] + "-" + code0Cda[0] + "," + code0Cda[1];
        }
    }

    public List<String> generateRoutes(String[][] codeMatrix) {
        List<String> list = new ArrayList<>();

@@ -45,13 +67,13 @@
                if (currentCodeData == null || CodeNodeType.NONE.val.equals(currentCodeData)) {
                    continue;
                }
                Code currCode = codeService.selectByData(currentCodeData);
                Code currCode = codeService.getCacheByData(currentCodeData);

                // 检查右边相邻条码
                if (j + 1 < cols) {
                    String rightCodeData = codeMatrix[i][j + 1];
                    if (!Cools.isEmpty(rightCodeData) && !CodeNodeType.NONE.val.equals(rightCodeData)) {
                        Code rightCode = codeService.selectByData(rightCodeData);
                        Code rightCode = codeService.getCacheByData(rightCodeData);
                        list.add(currCode.getData() + "-" + rightCode.getData());
                        routeService.createRouteByCode(currCode, rightCode, 0, null);
                        codeGapService.createCodeGapByCode(currCode, rightCode, null);
@@ -64,7 +86,7 @@
                if (i + 1 < rows) {
                    String bottomCodeData = codeMatrix[i + 1][j];
                    if (!Cools.isEmpty(bottomCodeData) && !CodeNodeType.NONE.val.equals(bottomCodeData)) {
                        Code bottomCode = codeService.selectByData(bottomCodeData);
                        Code bottomCode = codeService.getCacheByData(bottomCodeData);
                        list.add(currCode.getData() + "-" + bottomCode.getData());
                        routeService.createRouteByCode(currCode, bottomCode, 0, null);
                        codeGapService.createCodeGapByCode(currCode, bottomCode, null);