From 39daa3f36baae1f28a8c9df5c7230e357dcb2f9e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 24 三月 2025 13:51:51 +0800
Subject: [PATCH] #
---
/dev/null | 112 --------------------------------------------------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 +--
2 files changed, 3 insertions(+), 116 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 1d11194..c920776 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -15,7 +15,6 @@
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
@@ -375,7 +374,7 @@
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
crnCommand.setCommand((short) 1);
log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}", crnCommand);
- if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
+ if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
} else {
@@ -482,7 +481,7 @@
taskWrk.setMarkStart(1);
}
- if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
+ if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command))) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(command));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
} else {
@@ -555,7 +554,7 @@
crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setCommand((short) 1);
- if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
+ if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
} else {
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
diff --git a/src/main/java/com/zy/asrs/utils/CommandUtils.java b/src/main/java/com/zy/asrs/utils/CommandUtils.java
deleted file mode 100644
index fbe4ec3..0000000
--- a/src/main/java/com/zy/asrs/utils/CommandUtils.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.zy.asrs.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.core.common.SpringUtils;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.TaskWrkService;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.enums.CommandStatusType;
-import com.zy.core.enums.CommandType;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.CommandPackage;
-import com.zy.core.model.command.CrnCommand;
-import com.zy.core.model.protocol.StaProtocol;
-
-import java.util.Date;
-
-public class CommandUtils {
-
- public static boolean offer(SlaveType type, Integer id, Task task) {
- return offer(type, id, task, true);
- }
-
- public static boolean offer(SlaveType type, Integer id, Task task, Boolean auto) {
- CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
- if (commandInfoService == null) {
- return false;
- }
- TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- if (taskWrkService == null) {
- return false;
- }
-
- CommandInfo commandInfo = null;
- TaskWrk taskWrk = null;
- int wrkNo = 0;//宸ヤ綔鍙�
- String taskNo = null;//浠诲姟鍙�
-
- if (type == SlaveType.Crn) {
- CommandPackage<CrnCommand> commandPackage = new CommandPackage<>();
- CrnCommand command = (CrnCommand) task.getData();
- wrkNo = command.getTaskNo();
- if (auto && wrkNo != 0) {
- taskWrk = taskWrkService.selectByWrkNo(wrkNo);
- taskNo = taskWrk.getTaskNo();
- }
-
- commandInfo = new CommandInfo();
- commandInfo.setWrkNo(wrkNo);
- commandInfo.setTaskNo(taskNo);
- commandInfo.setCommandStatus(CommandStatusType.CREATE.id);
- commandInfo.setStartTime(new Date());
- commandInfo.setDevice(SlaveType.Crn.toString());
- commandInfo.setCommandType(auto ? CommandType.AUTO.id : CommandType.MANUAL.id);
-
- commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
-
- command.setCommandId(commandInfo.getId());
- commandPackage.setWrkNo(wrkNo);
- commandPackage.setDevice("鍫嗗灈鏈�");
- commandPackage.setCommand(command);//淇濆瓨鍛戒护鎶ユ枃
- commandInfo.setCommand(JSON.toJSONString(commandPackage));
- commandInfoService.updateById(commandInfo);
-
- if (!auto) {
- //灏嗘寚浠よ繘琛屾姇閫�
- if (!MessageQueue.offer(type, id, task)) {
- return false;
- }
- }
- return true;
- } else if (type == SlaveType.Devp) {
- CommandPackage<StaProtocol> commandPackage = new CommandPackage<>();
- StaProtocol staProtocol = (StaProtocol) task.getData();
- wrkNo = staProtocol.getWorkNo();
- if (auto && wrkNo != 0) {
- taskWrk = taskWrkService.selectByWrkNo(wrkNo);
- taskNo = taskWrk.getTaskNo();
- }
-
- commandInfo = new CommandInfo();
- commandInfo.setWrkNo(wrkNo);
- commandInfo.setTaskNo(taskNo);
- commandInfo.setCommandStatus(CommandStatusType.CREATE.id);
- commandInfo.setStartTime(new Date());
- commandInfo.setDevice(SlaveType.Devp.toString());
- commandInfo.setCommandType(auto ? CommandType.AUTO.id : CommandType.MANUAL.id);
-
- commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
-
- staProtocol.setCommandId(commandInfo.getId());
- commandPackage.setCommand(staProtocol);
- commandPackage.setWrkNo(wrkNo);
- commandPackage.setDevice("杈撻�佺嚎");
- commandInfo.setCommand(JSON.toJSONString(commandPackage));//淇濆瓨鍛戒护鎶ユ枃
- commandInfoService.updateById(commandInfo);
-
- if (!auto) {
- //灏嗘寚浠よ繘琛屾姇閫�
- if (!MessageQueue.offer(type, id, task)) {
- return false;
- }
- }
- return true;
- }
-
- return false;
- }
-
-}
--
Gitblit v1.9.1