From dbae31a7a7cd59048ada9b51fe8faff545324c59 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 三月 2024 16:02:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CommandInfoController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoController.java b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
index b949f51..26e7ce6 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -15,6 +15,7 @@
import com.core.common.R;
import com.zy.common.web.BaseController;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CommandStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
import com.zy.core.model.command.CommandPackage;
@@ -149,7 +150,7 @@
return R.error("鎸囦护涓嶅瓨鍦�");
}
- commandInfo.setCommandStatus(2);//鎵ц鐘舵��
+ commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц鐘舵��
commandInfo.setExecuteTime(new Date());
if (commandInfoService.updateById(commandInfo)) {
//灏嗘寚浠よ繘琛屾姇閫�
@@ -162,11 +163,11 @@
switch (type) {
case Crn:
CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
- MessageQueue.offer(type, crnCommand.getCrnNo(), new Task(2, crnCommand));
+ MessageQueue.offer(type, crnCommand.getCrnNo(), new Task(5, crnCommand));
break;
case Devp:
StaProtocol staProtocol = JSON.parseObject(commandPackage.getCommand().toString(), StaProtocol.class);
- MessageQueue.offer(type, staProtocol.getSiteId(), new Task(2, staProtocol));
+ MessageQueue.offer(type, staProtocol.getSiteId(), new Task(3, staProtocol));
break;
}
}
@@ -181,7 +182,7 @@
return R.error("鎸囦护涓嶅瓨鍦�");
}
- commandInfo.setCommandStatus(3);//瀹屾垚鐘舵��
+ commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//瀹屾垚鐘舵��
commandInfo.setCompleteTime(new Date());
commandInfoService.updateById(commandInfo);
return R.ok();
--
Gitblit v1.9.1