#

vincentlu

2025-12-18 830d326b37c4a5d13ae55678d5729993908f9c90

#

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

@@ -12,7 +12,6 @@
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@@ -72,9 +71,10 @@
        return null;
    }

    public List<String> getAreaCodeListByAgvNo(String agvNo) {
        List<String> areaCodeList = new ArrayList<>();
        return areaCodeList;
    // 如果都没有命中，就返回全部code
    public List<String> getCodesByAgvId(Long agvId) {
        List<Long> areaIds = areaAgvService.queryAreaIdsByAgvId(agvId);
        return areaGovernService.queryCodes(areaIds);
    }

}

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

@@ -10,6 +10,7 @@
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Area;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.AreaAgvService;
import com.zy.acs.manager.manager.service.AreaService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -35,6 +36,8 @@
    private AreaService areaService;
    @Autowired
    private MapDataDispatcher mapDataDispatcher;
    @Autowired
    private AreaAgvService areaAgvService;

    // launcher -------------------------------------------------------
    @EventListener(ApplicationReadyEvent.class)
@@ -107,8 +110,6 @@
//            String areaDataStr = redis.getValue(RedisConstant.MAP_AREA_DATA_FLAG, redisKey);
//
//        }

        System.out.println(1);
    }

    // checkout list of area by code data

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

@@ -74,9 +74,7 @@
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private AreaAgvService areaAgvService;
    @Autowired
    private AreaGovernService areaGovernService;
    private AgvAreaDispatcher agvAreaDispatcher;

    @PostConstruct
    public void init() {
@@ -222,8 +220,7 @@
        Set<String> notInCodeSet = new HashSet<>();

//        Collections.shuffle(CODE_DATA_CACHE);
        List<Long> areaIds = areaAgvService.queryAreaIdsByAgvId(agvDetail.getAgvId());
        List<String> codeList = areaGovernService.queryCodes(areaIds);
        List<String> codeList = agvAreaDispatcher.getCodesByAgvId(agvDetail.getAgvId());
        Collections.shuffle(codeList);

        for (String endCodeData : codeList) {

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java

@@ -61,16 +61,16 @@
        }

        // area limit
//        List<String> areaCodeList = agvAreaDispatcher.getAreaCodeListByAgvNo(agvService.getAgvNo(agvId));
//        if (Cools.isEmpty(areaCodeList)) {
//            funcStaList.clear();
//        } else {
//            funcStaList.removeIf(funcSta -> {
//                Code code = codeService.getCacheById(funcSta.getCode());
//                if (Cools.isEmpty(code, code.getData())) { return true; }
//                return !areaCodeList.contains(code.getData());
//            });
//        }
        List<String> areaCodeList = agvAreaDispatcher.getCodesByAgvId(agvId);
        if (Cools.isEmpty(areaCodeList)) {
            funcStaList.clear();
        } else {
            funcStaList.removeIf(funcSta -> {
                Code code = codeService.getCacheById(funcSta.getCode());
                if (Cools.isEmpty(code, code.getData())) { return true; }
                return !areaCodeList.contains(code.getData());
            });
        }

        if (!Cools.isEmpty(funcStaList)) {
            Collections.shuffle(funcStaList);