From 431f3056427a1393dbfe3c6203aea0f79fcac89a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 29 九月 2024 09:28:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java | 10 +++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java | 2 +-
zy-acs-flow/src/page/mission/MissionList.jsx | 7 +++++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java | 3 ++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 8 ++++----
zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml | 6 ++++++
8 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/zy-acs-flow/src/page/mission/MissionList.jsx b/zy-acs-flow/src/page/mission/MissionList.jsx
index 3135d7c..64491f9 100644
--- a/zy-acs-flow/src/page/mission/MissionList.jsx
+++ b/zy-acs-flow/src/page/mission/MissionList.jsx
@@ -59,7 +59,11 @@
}
const filters = [
- <SearchInput source="q" alwaysOn />,
+ // <SearchInput source="q" alwaysOn />,
+ <ReferenceInput source="agvId" label="table.field.segment.agvId" reference="agv" alwaysOn>
+ <AutocompleteInput label="table.field.segment.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
+ </ReferenceInput>,
+ <TextInput source="groupNo" label="table.field.segment.groupId" />,
];
const MissionLayout = () => {
@@ -89,7 +93,6 @@
<ListToolbar filters={filters} actions={(
<TopToolbar>
<FilterButton />
- <SelectColumnsButton preferenceKey='locSts' />
</TopToolbar>
)} />
<Card>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java
index b8be782..8896c77 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java
@@ -32,7 +32,15 @@
@PreAuthorize("hasAuthority('manager:mission:list')")
@PostMapping("/mission/page")
public R page(@RequestBody Map<String, Object> map) {
- return R.ok().add(Cools.add("total", Integer.MAX_VALUE).add("records", missionService.getList()));
+ Long agvId = null;
+ if (null != map.get("agvId")) {
+ agvId = Long.parseLong(String.valueOf(map.get("agvId")));
+ }
+ String groupNo = null;
+ if (!Cools.isEmpty(map.get("groupNo"))) {
+ groupNo = String.valueOf(map.get("groupNo"));
+ }
+ return R.ok().add(Cools.add("total", Integer.MAX_VALUE).add("records", missionService.getList(agvId, groupNo)));
}
@PreAuthorize("hasAuthority('manager:mission:list')")
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java
index 429948e..2e8d2d0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.acs.manager.manager.entity.Segment;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface SegmentMapper extends BaseMapper<Segment> {
- List<String> getGroupNo(String state);
+ List<String> getGroupNo(@Param("state")String state, @Param("agvId")Long agvId, @Param("groupNo")String groupNo);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java
index 2599c31..dab1692 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java
@@ -6,6 +6,6 @@
public interface MissionService {
- List<MissionVo> getList();
+ List<MissionVo> getList(Long agvId, String groupNo);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
index 2ac3a9c..3772f0d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
@@ -16,6 +16,6 @@
List<Segment> getByAgvAndState(Long agvId, String state);
- List<String> getGroupNo(SegmentStateType state);
+ List<String> getGroupNo(SegmentStateType state, Long agvId, String groupNo);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
index 14c59a0..7b50ca0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
@@ -24,11 +24,11 @@
private SegmentService segmentService;
@Override
- public List<MissionVo> getList() {
+ public List<MissionVo> getList(Long agvId, String groupNo) {
List<MissionVo> result = new ArrayList<>();
- List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING);
- for (String groupNo : runningGroupNos) {
- MissionVo vo = generate(groupNo);
+ List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING, agvId, groupNo);
+ for (String runningGroupNo : runningGroupNos) {
+ MissionVo vo = generate(runningGroupNo);
if (null != vo) {
result.add(vo);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index eadf727..02f2a82 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -61,8 +61,8 @@
}
@Override
- public List<String> getGroupNo(SegmentStateType state) {
- return this.baseMapper.getGroupNo(state.toString());
+ public List<String> getGroupNo(SegmentStateType state, Long agvId, String groupNo) {
+ return this.baseMapper.getGroupNo(state.toString(), agvId, groupNo);
}
}
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
index b1d1e48..e5b9b99 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
@@ -28,6 +28,12 @@
group_id
FROM man_segment
WHERE state = #{state}
+ <if test="agvId != null">
+ AND agv_id = #{agvId}
+ </if>
+ <if test="groupNo != null">
+ AND group_id LIKE CONCAT('%', #{groupNo}, '%')
+ </if>
GROUP BY group_id
ORDER BY create_time DESC
</select>
--
Gitblit v1.9.1