From 3aefb217aa542c1e80034dd9bd385724fc2292f6 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 18 十二月 2025 15:30:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java | 2 ++
zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml | 8 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java | 5 +++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java | 4 ++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 4 +++-
5 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
index 71829bb..8d916b3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
+++ b/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) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java
index 6a5e73f..728df54 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java
+++ b/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();
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java
index 23553f7..34a2c9a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java
+++ b/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();
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java
index 0597ce0..680ffde 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java
+++ b/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();
+ }
+
}
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml
index b634ddd..20c9dc9 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml
+++ b/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>
--
Gitblit v1.9.1