From 6e407917dfd6c37a9dc31cca14f493192e23e948 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 七月 2023 10:52:50 +0800
Subject: [PATCH] command write
---
src/main/java/com/zy/asrs/controller/LiftController.java | 121 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index f88ea21..147e6fd 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -10,14 +11,16 @@
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasLift;
import com.zy.asrs.service.BasLiftService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.LiftProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LiftSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.LiftAssignCommand;
+import com.zy.core.model.command.*;
import com.zy.core.model.protocol.LiftProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LiftThread;
@@ -41,7 +44,9 @@
@Autowired
private BasLiftService basLiftService;
@Autowired
- private WrkMastService wrkMastService;
+ private CommonService commonService;
+ @Autowired
+ private RedisUtil redisUtil;
@PostMapping("/table/lift/state")
@ManagerAuth(memo = "鎻愬崌鏈轰俊鎭〃")
@@ -56,6 +61,7 @@
// 鑾峰彇鎻愬崌鏈轰俊鎭�
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
if (liftThread == null) {
+ vo.setProtocolStatus(LiftProtocolStatusType.OFFLINE.id);//绂荤嚎
continue;
}
LiftProtocol liftProtocol = liftThread.getLiftProtocol();
@@ -63,7 +69,7 @@
continue;
}
vo.setTaskNo(liftProtocol.getTaskNo()); // 浠诲姟鍙�
- vo.setProtocolStatus(liftProtocol.getProtocolStatusType().desc);
+ vo.setProtocolStatus(liftProtocol.getProtocolStatusType().id);
vo.setLiftLock(liftProtocol.getLiftLock());
vo.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback());
vo.setReady(liftProtocol.getReady());
@@ -119,6 +125,7 @@
vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
+ vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
}
return R.ok().add(list);
}
@@ -199,9 +206,10 @@
LiftAssignCommand assignCommand = new LiftAssignCommand();
assignCommand.setLiftNo(liftSlave.getId().shortValue()); // 鎻愬崌鏈虹紪鍙�
- assignCommand.setTaskNo((short) 9999);
+ assignCommand.setTaskNo((short) commonService.getWorkNo(3));//鑾峰彇浠诲姟鍙�
assignCommand.setTaskMode(param.getLiftTaskMode().shortValue());
assignCommand.setAuto(false);//鎵嬪姩妯″紡
+ assignCommand.setLev(param.getLev());//绉诲姩妤煎眰
if (MessageQueue.offer(SlaveType.Lift, liftSlave.getId(), new Task(3, assignCommand))) {
return R.ok();
@@ -213,4 +221,107 @@
return R.error();
}
+ @PostMapping("/detl/update")
+ @ManagerAuth(memo = "淇敼鏁版嵁")
+ public R liftUpdate(@RequestParam Integer liftNo,
+ @RequestParam Short workNo,
+ @RequestParam String pakMk){
+ for (LiftSlave liftSlave : slaveProperties.getLift()) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
+ if (liftThread == null) {
+ return R.error("plc宸叉帀绾�");
+ }
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ return R.error("plc宸叉帀绾�");
+ }
+ if (workNo != null) {
+ liftProtocol.setTaskNo(workNo);
+ }
+ if (pakMk != null) {
+ liftProtocol.setPakMk(pakMk.equals("Y"));
+ }
+ }
+ return R.error("plc宸叉帀绾�");
+ }
+
+ @RequestMapping(value = "/command/query")
+ public R liftCommandQuery(@RequestParam("wrkNo") Integer wrkNo) {
+ Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ if (o == null) {
+ return R.error();
+ }
+ LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
+ return R.ok().add(redisCommand);
+ }
+
+ //鍥為��鍛戒护
+ @RequestMapping(value = "/command/rollback")
+ public R liftCommandRollback(@RequestParam("wrkNo") Integer wrkNo
+ , @RequestParam("commandStep") Integer commandStep) {
+ Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ if (o == null) {
+ return R.error();
+ }
+ LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
+ redisCommand.setCommandStep(commandStep);
+ redisUtil.set("lift_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
+ return R.ok();
+ }
+
+ //鍛戒护瀹屾垚鐘舵�佸垏鎹�
+ @RequestMapping(value = "/command/completeSwitch")
+ public R liftCommandCompleteSwitch(@RequestParam("wrkNo") Integer wrkNo
+ , @RequestParam("commandStep") Integer commandStep
+ , @RequestParam("complete") Integer complete) {
+ Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ if (o == null) {
+ return R.error();
+ }
+ LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
+ LiftAssignCommand assignCommand = redisCommand.getAssignCommand();
+ List<LiftCommand> commands = assignCommand.getCommands();
+ LiftCommand command = commands.get(commandStep);
+ command.setComplete(complete != 0);
+ redisUtil.set("lift_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
+ return R.ok();
+ }
+
+ //閲嶅惎浠诲姟(鍛戒护)
+ @RequestMapping(value = "/command/restart")
+ public R liftCommandCompleteSwitch(@RequestParam("wrkNo") Integer wrkNo) {
+ Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ if (o == null) {
+ return R.error();
+ }
+ LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
+ Short liftNo = redisCommand.getLiftNo();
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftNo.intValue());
+ if (liftThread == null) {
+ return R.error();
+ }
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ return R.error();
+ }
+ if (!liftProtocol.isIdle()) {
+ return R.error();
+ }
+ //鎻愬崌鏈哄浜庣┖闂茬姸鎬侊紝杩涜浠诲姟鐨勬仮澶�
+ liftProtocol.setTaskNo(redisCommand.getWrkNo());//灏嗘彁鍗囨満绾跨▼鍒嗛厤浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//宸ヤ綔鐘舵��
+ return R.ok();
+ }
+
+ //鍒犻櫎浠诲姟(鍛戒护)
+ @RequestMapping(value = "/command/del")
+ public R liftCommandDel(@RequestParam("wrkNo") Integer wrkNo) {
+ Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ if (o == null) {
+ return R.error();
+ }
+ redisUtil.del("lift_wrk_no_" + wrkNo);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1