zhang
5 天以前 29aa7746640d7d0c0f01f3e0d3f23ef3250086a7
数据为空的校验补充
2个文件已修改
19 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/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 -------------------------------