#

vincentlu

2025-12-18 ff176992e79222234735220fea9e767e4942d25d

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

@@ -5,7 +5,7 @@
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.CommonUtil;
import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
import com.zy.acs.manager.core.service.AgvAreaDispatcher;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.FuncStaMapper;
@@ -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.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());
//            });
//        }

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