From 8e058ad522772460a6964a4ba49002363e1e4d1a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 08 十一月 2024 13:23:23 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 351573d..89d03da 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -3,9 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.SnowflakeIdWorker;
-import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.common.domain.AgvAction;
import com.zy.acs.common.domain.AgvActionItem;
import com.zy.acs.common.domain.AgvProtocol;
@@ -14,8 +11,15 @@
import com.zy.acs.common.domain.protocol.AGV_70_UP;
import com.zy.acs.common.domain.protocol.IMessageBody;
import com.zy.acs.common.domain.protocol.action.*;
-import com.zy.acs.common.enums.*;
+import com.zy.acs.common.enums.AgvBackpackType;
+import com.zy.acs.common.enums.AgvCompleteType;
+import com.zy.acs.common.enums.AgvDirectionType;
+import com.zy.acs.common.enums.AgvSpeedType;
+import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.common.utils.Utils;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.SnowflakeIdWorker;
+import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.domain.TaskDto;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.common.utils.CommonUtil;
@@ -46,6 +50,7 @@
@Component("mainService")
public class MainService {
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
private static final int LOCK_TIMEOUT = 5;
private final ReentrantLock lock = new ReentrantLock(Boolean.TRUE);
@@ -110,7 +115,7 @@
taskDtoList.sort((o1, o2) -> o2.getPriority() - o1.getPriority());
// 鏍￠獙
- List<Task> taskList = validService.validBusDto(taskDtoList);
+ List<Task> taskList = validService.validTaskDtoList(taskDtoList);
// 淇濆瓨鎬荤嚎
Date now = new Date();
@@ -649,6 +654,10 @@
default:
break;
}
+
+// if (taskType.equals(TaskTypeType.TO_STANDBY)) {
+// redis.setObject(RedisConstant.AGV_TO_STANDBY_FLAG, agv.getUuid(), false);
+// }
return true;
} catch (Exception e) {
@@ -1346,7 +1355,7 @@
}
// segment call back
- trafficService.callback(segmentList);
+ segmentService.processNext(segmentList);
log.info("Agv [{}] {}浣滀笟瀹屾瘯 ==========>> ", protocol.getAgvNo(), serialNo);
--
Gitblit v1.9.1