Merge branch 'jbly' into zkd

zhang

2025-06-17 38ca6237e0375e77b11c05b1ae0b1c9fe0dd94ec

Merge branch 'jbly' into zkd

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java

@@ -251,6 +251,8 @@
        add("00001704");
        add("00001705");
        add("00001706");
        add("00001850");
        add("00001851");
    }};

    public static final ArrayList<String> LEFT_AREA  = new ArrayList<String>(){{

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

@@ -179,8 +179,8 @@
        Double maxY = Double.parseDouble(String.valueOf(map.get("max_y")));

        // 缩放后需要的偏移量
        double scaleOffsetX = width *  (1 -CodeUtils.ADAPTATION_SCALE) / 2;
        double scaleOffsetY = height *  (1 -CodeUtils.ADAPTATION_SCALE) / 2;
        double scaleOffsetX = width * (1 - CodeUtils.ADAPTATION_SCALE) / 2;
        double scaleOffsetY = height * (1 - CodeUtils.ADAPTATION_SCALE) / 2;

        List<Code> codeList = this.list();
        for (Code code : codeList) {
@@ -213,7 +213,11 @@
        List<Long> ids = this.baseMapper.selectAllLocCode();
        List<Code> codeList = new ArrayList<>();
        for (Long id : ids) {
            codeList.add(this.getById(id));
            Code byId = this.getById(id);
            if (byId != null) {
                codeList.add(byId);
            }

        }
        return codeList;
    }

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

@@ -7,10 +7,7 @@
import com.zy.acs.manager.common.utils.CommonUtil;
import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.FuncStaType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.FuncStaMapper;
import com.zy.acs.manager.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +53,7 @@
    @Override
    public List<FuncSta> findInIdleStatus(FuncStaType type, Long agvId) {
        LambdaQueryWrapper<FuncSta> wrapper = new LambdaQueryWrapper<FuncSta>()
                .eq(FuncSta::getType, type).eq(FuncSta::getStatus, StatusType.ENABLE.val);
                .eq(FuncSta::getType, type).eq(FuncSta::getStatus, StatusType.ENABLE.val).eq(FuncSta::getState, FuncStaStateType.IDLE.toString());
        List<FuncSta> funcStaList = this.list(wrapper);

        if (Cools.isEmpty(funcStaList)) {

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

@@ -2,6 +2,7 @@

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.manager.common.exception.BusinessException;
import com.zy.acs.manager.manager.controller.result.MissionVo;
import com.zy.acs.manager.manager.entity.*;
@@ -70,7 +71,13 @@
        Long recentCode = agvDetail.getRecentCode();
        String currCode = null;
        if (null != recentCode) {
            currCode = codeService.getCacheById(recentCode).getData();
            Code cacheById = codeService.getCacheById(recentCode);
            if (cacheById != null) {
                currCode = cacheById.getData();
            } else {
                throw new CoolException(segment.getAgvId() + "小车还在删除的点位中");
            }

        }

        // action -------------------------------