From 03b9be24e5a9bc5cf746beac1ac43330183c2c63 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 15 一月 2026 13:32:37 +0800
Subject: [PATCH] agv定时任务后分配站点
---
src/main/java/com/zy/asrs/task/handler/AgvHandler.java | 244 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 228 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
index 96d2be9..60afb65 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
@@ -6,23 +6,25 @@
import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.TaskLog;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.BasStationMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskLogService;
import com.zy.asrs.service.TaskService;
import com.zy.common.constant.ApiInterfaceConstant;
+import com.zy.common.properties.AgvProperties;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -49,19 +51,59 @@
@Resource
private BasStationMapper basStationMapper;
- @Value("${Agv.sendTask}")
- private boolean agvSendTask;
+ @Resource
+ private BasDevpMapper basDevpMapper;
+
+ @Resource
+ private AgvProperties agvProperties;
+
+ /**
+ * 绔欑偣杞璁℃暟鍣紝鐢ㄤ簬骞冲潎鍒嗛厤绔欑偣
+ * Key: 绔欑偣缁勬爣璇嗭紙濡� "east" 鎴� "west"锛夛紝Value: 褰撳墠杞绱㈠紩
+ */
+ private final Map<String, AtomicInteger> siteRoundRobinCounters = new ConcurrentHashMap<>();
/**
* 鍛煎彨agv鎼繍
*/
public void callAgv(List<Task> taskList) {
- if (!agvSendTask) {
+ if (!agvProperties.isSendTask()) {
return;
}
for (Task task : taskList) {
+ // 濡傛灉浠诲姟娌℃湁鍒嗛厤绔欑偣锛屽厛鍒嗛厤绔欑偣
+ String staNo = task.getStaNo();
+ if (staNo == null || staNo.isEmpty()) {
+ Integer allocatedSite = allocateSiteForTask(task);
+ if (allocatedSite == null) {
+ log.warn("浠诲姟ID锛歿}鏃犳硶鍒嗛厤绔欑偣锛岃烦杩囨湰娆″彂閫�", task.getId());
+ continue; // 鏃犳硶鍒嗛厤绔欑偣锛岃烦杩囨湰娆″彂閫�
+ }
+ staNo = String.valueOf(allocatedSite);
+ task.setStaNo(staNo);
+ taskService.updateById(task);
+ log.info("浠诲姟ID锛歿}宸插垎閰嶇珯鐐癸細{}", task.getId(), staNo);
+ }
+
+ // 妫�鏌ョ洰鏍囩珯鐐规槸鍚︽湁鏈畬鎴愮殑AGV浠诲姟
+ // 濡傛灉绔欑偣鏈夋湭瀹屾垚鐨勪换鍔★紝鍒欒烦杩囨湰娆″彂閫侊紝绛夊緟涓嬫
+ if (staNo != null && !staNo.isEmpty()) {
+ List<Task> unfinishedTasks = taskService.selectList(new EntityWrapper<Task>()
+ .eq("sta_no", staNo)
+ .eq("task_type", "agv")
+ .ne("id", task.getId()) // 鎺掗櫎褰撳墠浠诲姟鏈韩
+ .last("AND wrk_sts NOT IN (5, 15)") // 鎺掗櫎宸插畬鎴愮姸鎬�
+ );
+
+ if (!unfinishedTasks.isEmpty()) {
+ log.info("绔欑偣{}鏈墈}涓湭瀹屾垚鐨凙GV浠诲姟锛岃烦杩囨湰娆″彂閫侊紝绛夊緟浠诲姟瀹屾垚銆傚綋鍓嶄换鍔D锛歿}",
+ staNo, unfinishedTasks.size(), task.getId());
+ continue; // 璺宠繃鏈鍙戦�侊紝绛夊緟涓嬫
+ }
+ }
+
// 鍛煎彨agv
String response = "";
boolean success = false;
@@ -86,6 +128,9 @@
default:
}
String body = getRequest(task,namespace);
+ // 鎵撳嵃璇锋眰淇℃伅
+ log.info("{}鍛煎彨agv鎼繍 - 璇锋眰鍦板潃锛歿}", namespace, url);
+ log.info("{}鍛煎彨agv鎼繍 - 璇锋眰鍙傛暟锛歿}", namespace, body);
try {
// 浣跨敤浠欏伐M4鎺ュ彛
response = new HttpHandler.Builder()
@@ -94,17 +139,35 @@
.setJson(body)
.build()
.doPost();
+ // 鎵撳嵃杩斿洖鍙傛暟
+ log.info("{}鍛煎彨agv鎼繍 - 杩斿洖鍙傛暟锛歿}", namespace, response);
+
+ // 妫�鏌ュ搷搴旀槸鍚︿负绌�
+ if (response == null || response.trim().isEmpty()) {
+ log.error("{}鍛煎彨agv鎼繍澶辫触 - 浠诲姟ID锛歿}锛孉GV鎺ュ彛杩斿洖涓虹┖", namespace, task.getId());
+ continue;
+ }
+
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (jsonObject == null) {
+ log.error("{}鍛煎彨agv鎼繍澶辫触 - 浠诲姟ID锛歿}锛屽搷搴擩SON瑙ｆ瀽澶辫触锛屽搷搴斿唴瀹癸細{}", namespace, task.getId(), response);
+ continue;
+ }
+
+ Integer code = jsonObject.getInteger("code");
+ if (code != null && code.equals(200)) {
success = true;
task.setWrkSts(8L);
taskService.updateById(task);
- log.info(namespace + "鍛煎彨agv鎼繍鎴愬姛锛歿}", task.getId());
+ log.info("{}鍛煎彨agv鎼繍鎴愬姛 - 浠诲姟ID锛歿}", namespace, task.getId());
} else {
- log.error(namespace + "鍛煎彨agv鎼繍澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url, body, response);
+ String message = jsonObject.getString("message");
+ log.error("{}鍛煎彨agv鎼繍澶辫触 - 浠诲姟ID锛歿}锛岄敊璇爜锛歿}锛岄敊璇俊鎭細{}",
+ namespace, task.getId(), code, message);
}
} catch (Exception e) {
- log.error(namespace + "鍛煎彨agv鎼繍寮傚父", e);
+ log.error("{}鍛煎彨agv鎼繍寮傚父 - 浠诲姟ID锛歿}锛岃姹傚湴鍧�锛歿}锛岃姹傚弬鏁帮細{}锛屽紓甯镐俊鎭細{}",
+ namespace, task.getId(), url, body, e.getMessage(), e);
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
@@ -131,19 +194,34 @@
JSONObject object = new JSONObject();
// taskId浣跨敤浠诲姟ID锛屾牸寮忥細T + 浠诲姟ID
object.put("taskId", "T" + task.getId());
- object.put("fromBin", task.getSourceStaNo());
+ // fromBin浣跨敤婧愬簱浣嶇紪鍙凤紙sourceLocNo锛夛紝濡傛灉涓虹┖鍒欎娇鐢ㄦ簮绔欑偣缂栧彿锛坰ourceStaNo锛変綔涓哄閫�
+ String fromBin = task.getSourceLocNo();
+ if (fromBin == null || fromBin.isEmpty()) {
+ fromBin = task.getSourceStaNo();
+ }
+ if (fromBin == null || fromBin.isEmpty() || "0".equals(fromBin)) {
+ log.warn("浠诲姟{}鐨勬簮搴撲綅鍜屾簮绔欑偣閮戒负绌猴紝浣跨敤榛樿鍊�", task.getId());
+ fromBin = "0";
+ }
+ object.put("fromBin", fromBin);
+ // toBin浣跨敤鐩爣绔欑偣缂栧彿
object.put("toBin", task.getStaNo());
- // robotGroup浠巌nvWh瀛楁鑾峰彇锛屽鏋滄病鏈夊垯浣跨敤榛樿鍊�
+ // robotGroup浠巌nvWh瀛楁鑾峰彇锛屽鏋滄病鏈夊垯鏍规嵁绔欑偣缂栧彿鍒ゆ柇
String robotGroup = task.getInvWh();
if (robotGroup == null || robotGroup.isEmpty()) {
- robotGroup = "Group-001"; // 榛樿鏈哄櫒浜虹粍
+ robotGroup = determineRobotGroupByStation(task.getStaNo());
}
object.put("robotGroup", robotGroup);
// kind鏍规嵁浠诲姟绫诲瀷鏄犲皠
String kind = "";
switch (nameSpace) {
case "鍏ュ簱":
- kind = "瀹炴墭鍏ュ簱";
+ // 鍒ゆ柇鏄惁涓虹┖鎵樺叆搴擄細ioType=10 鎴� emptyMk="Y"
+ if (task.getIoType() == 10 || "Y".equals(task.getEmptyMk())) {
+ kind = "绌烘墭鍏ュ簱";
+ } else {
+ kind = "瀹炴墭鍏ュ簱";
+ }
break;
case "鍑哄簱":
kind = "瀹炴墭鍑哄簱";
@@ -156,6 +234,140 @@
}
object.put("kind", kind);
return object.toJSONString();
+ }
+
+ /**
+ * 涓轰换鍔″垎閰嶇珯鐐癸紙瀹氭椂浠诲姟涓皟鐢級
+ * @param task 浠诲姟瀵硅薄
+ * @return 鍒嗛厤鐨勭珯鐐圭紪鍙凤紝濡傛灉鏃犳硶鍒嗛厤鍒欒繑鍥瀗ull
+ */
+ private Integer allocateSiteForTask(Task task) {
+ // 鏍规嵁浠诲姟鐨刬nvWh锛堟満鍣ㄤ汉缁勶級鍒ゆ柇鏄笢渚ц繕鏄タ渚�
+ String robotGroup = task.getInvWh();
+ List<String> targetStations;
+ String groupKey;
+
+ if (robotGroup != null && robotGroup.equals(agvProperties.getRobotGroupEast())) {
+ // 涓滀晶绔欑偣
+ targetStations = agvProperties.getEastStations();
+ groupKey = "east";
+ } else if (robotGroup != null && robotGroup.equals(agvProperties.getRobotGroupWest())) {
+ // 瑗夸晶绔欑偣
+ targetStations = agvProperties.getWestStations();
+ groupKey = "west";
+ } else {
+ // 榛樿浣跨敤涓滀晶
+ targetStations = agvProperties.getEastStations();
+ groupKey = "east";
+ log.warn("浠诲姟ID锛歿}鐨勬満鍣ㄤ汉缁剓}鏈瘑鍒紝浣跨敤榛樿涓滀晶绔欑偣", task.getId(), robotGroup);
+ }
+
+ if (targetStations.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙敤鐨勭洰鏍囩珯鐐归厤缃�", task.getId());
+ return null;
+ }
+
+ // 灏嗙珯鐐瑰瓧绗︿覆鍒楄〃杞崲涓烘暣鏁板垪琛�
+ List<Integer> siteIntList = targetStations.stream()
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
+
+ // 鍒ゆ柇鑳藉叆绔欑偣锛坕n_enable="Y"琛ㄧず鑳藉叆锛�
+ List<Integer> sites = basDevpMapper.selectList(
+ new EntityWrapper<BasDevp>()
+ .eq("in_enable", "Y")
+ .in("dev_no", siteIntList)
+ ).stream().map(BasDevp::getDevNo).collect(Collectors.toList());
+
+ if (sites.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鑳藉叆绔欑偣", task.getId());
+ return null;
+ }
+
+ // 鑾峰彇娌℃湁鍑哄簱浠诲姟鐨勭珯鐐�
+ List<Integer> canInSites = basDevpMapper.getCanInSites(sites);
+ if (canInSites.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙叆绔欑偣锛堣绛夊緟鍑哄簱瀹屾垚锛�", task.getId());
+ return null;
+ }
+
+ // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛�
+ List<BasDevp> devList = basDevpMapper.selectList(new EntityWrapper<BasDevp>()
+ .in("dev_no", canInSites)
+ .eq("in_enable", "Y")
+ .eq("canining", "Y")
+ );
+
+ if (devList.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛�", task.getId());
+ return null;
+ }
+
+ // 鍏ュ簱浠诲姟鏁版帓搴�
+ devList.sort(Comparator.comparing(BasDevp::getInQty));
+
+ // 閫夋嫨绔欑偣
+ BasDevp basDevp;
+ int minInQty = devList.get(0).getInQty();
+
+ // 绛涢�夊嚭浠诲姟鏁版渶灏戠殑绔欑偣鍒楄〃
+ List<BasDevp> minTaskSites = devList.stream()
+ .filter(dev -> dev.getInQty() == minInQty)
+ .collect(Collectors.toList());
+
+ // 鏍规嵁閰嶇疆閫夋嫨鍒嗛厤绛栫暐
+ String strategy = agvProperties.getSiteAllocation().getStrategy();
+ boolean enableRoundRobin = agvProperties.getSiteAllocation().isEnableRoundRobin();
+
+ if (minTaskSites.size() > 1 && enableRoundRobin && "round-robin".equals(strategy)) {
+ // 杞鍒嗛厤
+ AtomicInteger counter = siteRoundRobinCounters.computeIfAbsent(groupKey, k -> new AtomicInteger(0));
+ int index = counter.getAndIncrement() % minTaskSites.size();
+ basDevp = minTaskSites.get(index);
+ log.info("浣跨敤杞鍒嗛厤绛栫暐锛岀珯鐐圭粍锛歿}锛岃疆璇㈢储寮曪細{}锛岄�変腑绔欑偣锛歿}", groupKey, index, basDevp.getDevNo());
+ } else if (minTaskSites.size() > 1 && enableRoundRobin && "random".equals(strategy)) {
+ // 闅忔満鍒嗛厤
+ Random random = new Random();
+ int index = random.nextInt(minTaskSites.size());
+ basDevp = minTaskSites.get(index);
+ log.info("浣跨敤闅忔満鍒嗛厤绛栫暐锛岄�変腑绔欑偣锛歿}", basDevp.getDevNo());
+ } else {
+ // 榛樿锛氶�夋嫨绗竴涓紙浠诲姟鏈�灏戠殑锛�
+ basDevp = devList.get(0);
+ }
+
+ Integer endSite = basDevp.getDevNo();
+
+ // 鍏ュ簱鏆傚瓨+1
+ basDevpMapper.incrementInQty(endSite);
+
+ log.info("浠诲姟ID锛歿}宸插垎閰嶇珯鐐癸細{}", task.getId(), endSite);
+ return endSite;
+ }
+
+ /**
+ * 鏍规嵁绔欑偣缂栧彿鍒ゆ柇鏈哄櫒浜虹粍
+ * @param staNo 绔欑偣缂栧彿
+ * @return 鏈哄櫒浜虹粍鍚嶇О
+ */
+ private String determineRobotGroupByStation(String staNo) {
+ if (staNo == null || staNo.isEmpty()) {
+ return agvProperties.getRobotGroupEast(); // 榛樿浣跨敤涓滀晶鏈哄櫒浜虹粍
+ }
+
+ // 浠庨厤缃腑鑾峰彇绔欑偣鍒楄〃
+ Set<String> eastStations = new HashSet<>(agvProperties.getEastStations());
+ Set<String> westStations = new HashSet<>(agvProperties.getWestStations());
+
+ // 鍒ゆ柇绔欑偣灞炰簬鍝竴渚�
+ if (eastStations.contains(staNo)) {
+ return agvProperties.getRobotGroupEast(); // 涓滀晶鏈哄櫒浜�
+ } else if (westStations.contains(staNo)) {
+ return agvProperties.getRobotGroupWest(); // 瑗夸晶鏈哄櫒浜�
+ } else {
+ log.warn("绔欑偣缂栧彿涓嶅湪閰嶇疆鍒楄〃涓紝浣跨敤榛樿鏈哄櫒浜虹粍锛歿}", staNo);
+ return agvProperties.getRobotGroupEast(); // 榛樿浣跨敤涓滀晶鏈哄櫒浜虹粍
+ }
}
/**
@@ -231,7 +443,7 @@
* @return 鏄惁鎴愬姛
*/
public boolean cancelAgvTask(Task task) {
- if (!agvSendTask) {
+ if (!agvProperties.isSendTask()) {
return false;
}
--
Gitblit v1.9.1