From ff1be9fa2dba6eaffc449d09e62998348ea3b830 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 19 九月 2023 08:00:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 896319a..bb39709 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -65,7 +66,7 @@
@PostMapping("/table/shuttle/state")
@ManagerAuth(memo = "鍥涘悜绌挎杞︿俊鎭〃")
public R shuttleStateTable(){
- ArrayList<NyShuttleProtocol> list = new ArrayList<>();
+ ArrayList<JSONObject> list = new ArrayList<>();
List<BasShuttle> shuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>().orderBy("shuttle_no"));
for (BasShuttle basShuttle : shuttles) {
// 鑾峰彇鍥涘悜绌挎杞︿俊鎭�
@@ -74,10 +75,23 @@
continue;
}
NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ JSONObject shuttleData = JSON.parseObject(JSON.toJSONString(shuttleProtocol));
if (shuttleProtocol == null || shuttleProtocol.getShuttleNo()==null) {
+ list.add(shuttleData);
continue;
}
- list.add(shuttleProtocol);
+
+ shuttleData.put("moveAdvancePath", null);//绌挎杞﹂璁¤矾寰�
+ if (shuttleProtocol.getTaskNo() != 0) {
+ //瀛樺湪浠诲姟锛岃幏鍙栨寚浠�
+ Object object = redisUtil.get("shuttle_wrk_no_" + shuttleProtocol.getTaskNo());
+ if (object != null) {
+ ShuttleRedisCommand redisCommand = JSON.parseObject(object.toString(), ShuttleRedisCommand.class);
+ shuttleData.put("moveAdvancePath", redisCommand.getAssignCommand().getNodes());//绌挎杞﹂璁¤矾寰�
+ }
+ }
+
+ list.add(shuttleData);
}
return R.ok().add(list);
}
@@ -309,8 +323,20 @@
//澶嶄綅
shuttleProtocol.setTaskNo(0);//宸ヤ綔鍙锋竻绌�
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
- shuttleProtocol.setPakMk(true);//浣滀笟鏍囪澶嶄綅
+ shuttleProtocol.setPakMk(false);//浣滀笟鏍囪澶嶄綅
return R.ok();
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CONTROL) {
+ //灏忚溅绠″埗
+ NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
+ ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
+ commands.add(suspendCommand);
+ assignCommand.setCommands(commands);
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CANCEL_CONTROL) {
+ //灏忚溅鍙栨秷绠″埗
+ NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), false);
+ ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
+ commands.add(suspendCommand);
+ assignCommand.setCommands(commands);
} else {
throw new CoolException("鏈煡鍛戒护");
}
@@ -328,8 +354,9 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼鏁版嵁")
public R shuttleUpdate(@RequestParam Integer shuttleNo,
- @RequestParam Integer workNo,
- @RequestParam String pakMk){
+ @RequestParam Integer workNo,
+ @RequestParam String pakMk,
+ @RequestParam Integer token) {
NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
if (shuttleThread == null) {
return R.error("plc宸叉帀绾�");
@@ -344,6 +371,9 @@
if (pakMk != null) {
shuttleProtocol.setPakMk(pakMk.equals("Y"));
}
+ if (token != null) {
+ shuttleProtocol.setToken(token);
+ }
return R.ok();
}
--
Gitblit v1.9.1