#
vincentlu
2025-12-18 3aefb217aa542c1e80034dd9bd385724fc2292f6
#
5个文件已修改
23 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
@@ -64,7 +64,9 @@
            return Collections.emptyList();
        }
        List<Long> areaIds = areaGovernService.queryAreas(code);
        return areaAgvService.queryAgvIdsByAreaIds(areaIds);
        List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
        agvIds.addAll(areaAgvService.findAgvIdsWithoutAreaAgv());
        return agvIds;
    }
    public List<String> getAgvNosByStaNo(String staNo) {
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java
@@ -5,8 +5,12 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface AreaAgvMapper extends BaseMapper<AreaAgv> {
    List<Long> findAgvIdsWithoutAreaAgv();
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java
@@ -15,4 +15,6 @@
    void removeByAreaId(Long areaId);
    List<Long> findAgvIdsWithoutAreaAgv();
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java
@@ -43,4 +43,9 @@
        this.remove(new LambdaQueryWrapper<AreaAgv>().eq(AreaAgv::getAreaId, areaId));
    }
    @Override
    public List<Long> findAgvIdsWithoutAreaAgv() {
        return this.baseMapper.findAgvIdsWithoutAreaAgv();
    }
}
zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml
@@ -2,4 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.acs.manager.manager.mapper.AreaAgvMapper">
    <select id="findAgvIdsWithoutAreaAgv" resultType="java.lang.Long">
        SELECT ma.id
        FROM man_agv ma
        LEFT JOIN man_area_agv maa ON ma.id = maa.agv_id
        WHERE maa.agv_id IS NULL
        and ma.deleted = 0
    </select>
</mapper>