1

zhang

3 天以前 c42a7c76e24940db9e81307dc67104d9068c3119

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

@@ -2,20 +2,25 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
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;
import com.zy.acs.manager.manager.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;

@Slf4j
@Service("funcStaService")
public class FuncStaServiceImpl extends ServiceImpl<FuncStaMapper, FuncSta> implements FuncStaService {

@@ -31,6 +36,9 @@
    private TaskService taskService;
    @Autowired
    private AgvAreaDispatcher agvAreaDispatcher;




    @Override
    public FuncSta getByCodeAndType(Long codeId, String type) {
@@ -61,16 +69,18 @@
        }

        // 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());
//            });
//        }
        if (agvAreaDispatcher.isAgvExistsInAnyArea(agvId)) {
            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);
@@ -92,7 +102,7 @@
                    AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
                    AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
                    if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
                        if (agvDetail.getVol() < agvModel.getQuaBattery()) {
                        if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
                            return false;
                        }
                    } else {