#

luxiaotao1123

2024-11-12 a3c03c5e7a835b4a83aabf2b989d6b1425441182

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/SortCodeDto.java

New file
@@ -0,0 +1,23 @@
package com.zy.acs.manager.core.domain;

import lombok.Data;

/**
 * Created by vincent on 11/12/2024
 */
@Data
public class SortCodeDto {

    private String code;

    private Integer serial = -1;

    public SortCodeDto() {
    }

    public SortCodeDto(String code, Integer serial) {
        this.code = code;
        this.serial = serial;
    }

}

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

@@ -2,10 +2,11 @@

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.core.domain.SortCodeDto;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.service.CodeService;
@@ -13,8 +14,10 @@
import lombok.extern.slf4j.Slf4j;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * Created by vincent on 6/6/2024
@@ -447,21 +450,24 @@
    }

    public List<String> queryCodeListFromDynamicNode(Integer lev, String nodeType) {
        List<String> nodes = new ArrayList<>();
        if (Cools.isEmpty(nodeType)) {
            return nodes;
            return new ArrayList<>();
        }
        lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);

        List<SortCodeDto> codeList = new ArrayList<>();
        DynamicNode[][] dynamicMatrix = getDynamicMatrix(lev);
        String[][] codeMatrix = this.getCodeMatrix(lev);
        for (int i = 0; i < codeMatrix.length; i++) {
            for (int j = 0; j < codeMatrix[i].length; j++) {
                if (nodeType.equals(dynamicMatrix[i][j].getVehicle())) {
                    nodes.add(codeMatrix[i][j]);
                DynamicNode dynamicNode = dynamicMatrix[i][j];
                if (nodeType.equals(dynamicNode.getVehicle())) {
                    codeList.add(new SortCodeDto(codeMatrix[i][j], dynamicNode.getSerial()));
                }
            }
        }
        return nodes;
        codeList.sort(Comparator.comparingInt(SortCodeDto::getSerial));
        return codeList.stream().map(SortCodeDto::getCode).collect(Collectors.toList());
    }

    public void modifyDynamicMatrix(Integer lev, List<String> codeList, String vehicle) {