From 882d2ee2d9a35bf02e5fbb11a79c3abffe9cfe61 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 16:43:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CommandInfoController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoController.java b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
index 52b6afb..60d0a64 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -8,11 +8,13 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.service.CommandInfoService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.service.TaskWrkService;
import com.zy.common.web.BaseController;
import com.zy.core.cache.MessageQueue;
import com.zy.core.enums.CommandStatusType;
@@ -31,6 +33,9 @@
@Autowired
private CommandInfoService commandInfoService;
+
+ @Autowired
+ private TaskWrkService taskWrkService;
@RequestMapping(value = "/commandInfo/{id}/auth")
@ManagerAuth
@@ -150,6 +155,14 @@
return R.error("鎸囦护涓嶅瓨鍦�");
}
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(commandInfo.getWrkNo());
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+ if (taskWrk.getWrkSts() !=3 && taskWrk.getWrkSts() !=12 ){
+ return R.error("浠诲姟鏈浜庢墽琛岀姸鎬�");
+ }
+
commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц鐘舵��
commandInfo.setExecuteTime(new Date());
if (commandInfoService.updateById(commandInfo)) {
@@ -163,11 +176,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;
}
}
--
Gitblit v1.9.1