From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:54:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CommandInfoController.java | 22 ++++++++++++++++++----
1 files changed, 18 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..60d0a64 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -8,13 +8,16 @@
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;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
import com.zy.core.model.command.CommandPackage;
@@ -30,6 +33,9 @@
@Autowired
private CommandInfoService commandInfoService;
+
+ @Autowired
+ private TaskWrkService taskWrkService;
@RequestMapping(value = "/commandInfo/{id}/auth")
@ManagerAuth
@@ -149,7 +155,15 @@
return R.error("鎸囦护涓嶅瓨鍦�");
}
- commandInfo.setCommandStatus(2);//鎵ц鐘舵��
+ 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)) {
//灏嗘寚浠よ繘琛屾姇閫�
@@ -162,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;
}
}
@@ -181,7 +195,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