From 052ee1f9c0b9e2bc8bbd4cf135ae45fed7422023 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十月 2024 10:36:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 8 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java | 8 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 9 +++++++++
5 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
index 7f0ab7f..95d0c00 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
@@ -2,10 +2,14 @@
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.core.service.LaneService;
+import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* Created by vincent on 10/24/2024
@@ -16,9 +20,13 @@
@Autowired
private LaneService laneService;
+ @Autowired
+ private TaskService taskService;
@GetMapping("/lanes")
public R getLanes() {
+ List<Task> taskList = taskService.findTasksByLaneHash("4b81ebaedd8ed7662d37b63e20dec5dd089d4c32136b8826c6323839fe51938e");
+
return R.ok().add(laneService.search("00000010"));
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
index 750c81b..5e7cbd4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
@@ -76,10 +76,15 @@
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
+ // checkout lane
Lane originLane = taskService.checkoutOriginLane(task);
Lane destinationLane = taskService.checkoutDestinationLane(task);
+ // allocate about origin
+ taskService.findTasksByLaneHash(originLane.getHashCode());
+ // allocate about destination
+ taskService.findTasksByLaneHash(destinationLane.getHashCode());
/**
* 1. 鍒ゆ柇task鐨勮捣濮嬬偣鍜岀洰鐨勭偣鎵�鍦ㄧ殑宸烽亾鎵胯浇浠诲姟鏁伴噺锛�
@@ -90,6 +95,10 @@
* 鍒ゆ柇閫昏緫锛氳儗绡撴暟閲忔渶灏戠殑灏忚溅杞鐨勬椂鍊欙紝浼樺厛绾ф渶楂�
*/
+
+ task.setOriLaneHash(originLane.getHashCode());
+ task.setDestLaneHash(destinationLane.getHashCode());
+
return null;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index 7c84e2a..40807f5 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -119,7 +119,7 @@
* 璧峰宸烽亾鍝堝笇
*/
@ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
- private Long oriLaneHash;
+ private String oriLaneHash;
/**
* 鐩爣绔�
@@ -143,7 +143,7 @@
* 鐩爣宸烽亾鍝堝笇
*/
@ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
- private Long destLaneHash;
+ private String destLaneHash;
/**
* 绌烘澘
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
index cd45ccd..f36819c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
@@ -30,4 +30,6 @@
Lane checkoutDestinationLane(Task task);
+ List<Task> findTasksByLaneHash(String laneHash);
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index 1121605..cce6d63 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -161,6 +161,14 @@
return laneService.search(codeService.getById(codeId).getData());
}
+ @Override
+ public List<Task> findTasksByLaneHash(String laneHash) {
+ if (Cools.isEmpty(laneHash)) {
+ return new ArrayList<>();
+ }
+ return this.list(new LambdaQueryWrapper<Task>().eq(Task::getOriLaneHash, laneHash).or().eq(Task::getDestLaneHash, laneHash));
+ }
+
@Transactional
public void maintainLocSts(Task task, Boolean complete) {
Loc oriLoc = null; Loc destLoc = null;
--
Gitblit v1.9.1