From 3c5935f579c0d51e64721101e81886ff957be229 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 09:14:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LiftController.java | 171 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 130 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 716ce31..0b5503b 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,7 +11,8 @@
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;
@@ -18,7 +20,7 @@
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;
@@ -42,20 +44,21 @@
@Autowired
private BasLiftService basLiftService;
@Autowired
- private WrkMastService wrkMastService;
+ private CommonService commonService;
+ @Autowired
+ private RedisUtil redisUtil;
@PostMapping("/table/lift/state")
@ManagerAuth(memo = "鎻愬崌鏈轰俊鎭〃")
public R liftStateTable(){
List<LiftStateTableVo> list = new ArrayList<>();
- List<BasLift> lifts = basLiftService.selectList(new EntityWrapper<BasLift>().orderBy("lift_no"));
- for (BasLift basLift : lifts) {
+ for (LiftSlave slave : slaveProperties.getLift()) {
// 琛ㄦ牸琛�
LiftStateTableVo vo = new LiftStateTableVo();
- vo.setLiftNo(basLift.getLiftNo()); //鎻愬崌鏈哄彿
+ vo.setLiftNo(slave.getId()); //鎻愬崌鏈哄彿
list.add(vo);
// 鑾峰彇鎻愬崌鏈轰俊鎭�
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
if (liftThread == null) {
vo.setProtocolStatus(LiftProtocolStatusType.OFFLINE.id);//绂荤嚎
continue;
@@ -66,28 +69,17 @@
}
vo.setTaskNo(liftProtocol.getTaskNo()); // 浠诲姟鍙�
vo.setProtocolStatus(liftProtocol.getProtocolStatusType().id);
- vo.setLiftLock(liftProtocol.getLiftLock());
- vo.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback());
- vo.setReady(liftProtocol.getReady());
- vo.setRunning(liftProtocol.getRunning());
- vo.setMode(liftProtocol.getMode());
- vo.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
- vo.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
- vo.setReverseFeedback(liftProtocol.getReverseFeedback());
- vo.setMotorOverload(liftProtocol.getMotorOverload());
- vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
- vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
- vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
- vo.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
- vo.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
- vo.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
- vo.setNotReady(liftProtocol.getNotReady());
- vo.setServoError1(liftProtocol.getServoError1());
- vo.setServoError2(liftProtocol.getServoError2());
- vo.setServoError3(liftProtocol.getServoError3());
- vo.setServoError4(liftProtocol.getServoError4());
- vo.setLiftActualSpeed(liftProtocol.getLiftActualSpeed());
- vo.setPakMk(liftProtocol.getPakMk());
+ vo.setModel(liftProtocol.getModel());
+ vo.setBusy(liftProtocol.getBusy());
+ vo.setHasTray(liftProtocol.getHasTray());
+ vo.setHasCar(liftProtocol.getHasCar());
+ vo.setDeviceError(liftProtocol.getDeviceError());
+ vo.setFrontOverrun(liftProtocol.getFrontOverrun());
+ vo.setBackOverrun(liftProtocol.getBackOverrun());
+ vo.setLeftOverrun(liftProtocol.getLeftOverrun());
+ vo.setRightOverrun(liftProtocol.getRightOverrun());
+ vo.setOverHeight(liftProtocol.getOverHeight());
+ vo.setOverWeight(liftProtocol.getOverWeight());
}
return R.ok().add(list);
}
@@ -96,14 +88,13 @@
@ManagerAuth(memo = "鎻愬崌鏈烘暟鎹〃")
public R liftMsgTable(){
List<LiftMsgTableVo> list = new ArrayList<>();
- List<BasLift> lifts = basLiftService.selectList(new EntityWrapper<BasLift>().orderBy("lift_no"));
- for (BasLift basLift : lifts) {
+ for (LiftSlave slave : slaveProperties.getLift()) {
// 琛ㄦ牸琛�
LiftMsgTableVo vo = new LiftMsgTableVo();
- vo.setLiftNo(basLift.getLiftNo()); // 鎻愬崌鏈哄彿
+ vo.setLiftNo(slave.getId()); // 鎻愬崌鏈哄彿
list.add(vo);
// 鑾峰彇鎻愬崌鏈轰俊鎭�
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
if (liftThread == null) {
continue;
}
@@ -114,13 +105,10 @@
vo.setWorkNo(liftProtocol.getTaskNo().intValue());//浠诲姟鍙�
vo.setPakMk(liftProtocol.getPakMk()?"Y" : "N"); // 浣滀笟鏍囪
- vo.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
- vo.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
- vo.setReverseFeedback(liftProtocol.getReverseFeedback());
- vo.setMotorOverload(liftProtocol.getMotorOverload());
- vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
- vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
- vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
+ vo.setLev(liftProtocol.getLev());
+ vo.setTaskAddress(liftProtocol.getTaskAddress());
+ vo.setDistAddress(liftProtocol.getDistAddress());
+ vo.setCompleteTaskNo(liftProtocol.getCompleteTaskNo());
vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
}
return R.ok().add(list);
@@ -202,7 +190,7 @@
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());//绉诲姩妤煎眰
@@ -217,4 +205,105 @@
return R.error();
}
+ @PostMapping("/detl/update")
+ @ManagerAuth(memo = "淇敼鏁版嵁")
+ public R liftUpdate(@RequestParam Integer liftNo,
+ @RequestParam Short workNo,
+ @RequestParam String pakMk){
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftNo);
+ 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.ok();
+ }
+
+ @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<NyLiftCommand> commands = assignCommand.getCommands();
+ NyLiftCommand 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