From 46f16aa85b0d41e812f8352003f54427a35e94e2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 25 八月 2020 15:00:50 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/CrnController.java | 324 +++++++++++++++++++++++++++++------------------------- 1 files changed, 174 insertions(+), 150 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java index cbc1d78..de0fd9b 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/src/main/java/com/zy/asrs/controller/CrnController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.core.annotations.ManagerAuth; -import com.core.common.BaseRes; import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.domain.enums.CrnStatusType; @@ -10,7 +9,9 @@ import com.zy.asrs.domain.vo.CommandLogVo; import com.zy.asrs.domain.vo.CrnMsgTableVo; import com.zy.asrs.domain.vo.CrnStateTableVo; +import com.zy.asrs.entity.BasCrnError; import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.mapper.BasCrnErrorMapper; import com.zy.asrs.service.WrkMastService; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; @@ -32,7 +33,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; /** * 鍫嗗灈鏈烘帴鍙� @@ -42,11 +42,14 @@ @RestController @RequestMapping("/crn") public class CrnController { - private static AtomicInteger integer = new AtomicInteger(); + @Autowired private SlaveProperties slaveProperties; @Autowired private WrkMastService wrkMastService; + @Autowired + private BasCrnErrorMapper basCrnErrorMapper; + @ManagerAuth(memo = "杩涜涓殑鍛戒护") @PostMapping("/command/ongoing") @@ -101,7 +104,7 @@ vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵�� } } else { - vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 妯″紡鐘舵�� + vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵�� } vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵�� vo.setWarn(""); // 鎶ヨ todo @@ -110,6 +113,7 @@ vo.setLev(crnProtocol.getLevel()); // 灞� vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆 vo.setLiftPos(crnProtocol.getLiftPosType().desc); // 杞借揣鍙颁綅缃� + vo.setWorkNo(crnProtocol.getAlarm1()); // 寮傚父鐮� list.add(vo); } return R.ok().add(list); @@ -133,6 +137,10 @@ CrnMsgTableVo vo = new CrnMsgTableVo(); vo.setCrnNo(crn.getId()); // 鍫嗗灈鏈哄彿 vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙� + BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1()); + if (null != crnError) { + vo.setError(crnError.getErrorCode() + crnError.getErrName()); + } if (crnProtocol.getTaskNo()>0) { WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); if (wrkMast != null) { @@ -143,7 +151,7 @@ vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅 } } else { - vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 妯″紡鐘舵�� + vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵�� } list.add(vo); @@ -157,11 +165,10 @@ StringBuilder str = new StringBuilder(); String s; int i = 0; - while( (s = OutputQueue.CRN.poll()) != null && i <=10) { + while((s = OutputQueue.CRN.poll()) != null && i <=10) { str.append("\n").append(s); i++; } -// str = new StringBuilder("\n" + new Date().toLocaleString() + "銆�2020-5-29 13:14:22銆戞壂鎻弍lcA 鐩爣绔�--273283723728327636432343234323422732837237283276364323432343234227328372372832763643234323432342"); return R.ok().add(str.toString()); } @@ -173,147 +180,40 @@ @ManagerAuth(memo = "鍏ュ簱") @PostMapping("/operator/put") public R crnPut(CrnOperatorParam param){ - if (param.getCrnNo() == null) { - return R.error(BaseRes.PARAM); - } - for (CrnSlave crn : slaveProperties.getCrn()) { - // 鑾峰彇鍫嗗灈鏈轰俊鎭� - if (param.getCrnNo().equals(crn.getId())) { - CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); - if (crnThread == null) { - break; - } - CrnProtocol crnProtocol = crnThread.getCrnProtocol(); - if (crnProtocol == null) { - break; - } - // 绌洪棽鍒ゆ柇 - if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) { - CrnCommand command = new CrnCommand(); - command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� - command.setTaskNo((short) 0); // 宸ヤ綔鍙� - command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� - command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡 - command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 - command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 - command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 - command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� - command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� - if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) { - return R.error("鍛戒护涓嬪彂澶辫触"); - } else { - return R.ok(); - } - } else { - return R.error("鍫嗗灈鏈洪潪绌洪棽鐘舵��"); - } - } - } - return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎"); + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡 + command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 + command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 + command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 + command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� + command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); } @ManagerAuth(memo = "鍑哄簱") @PostMapping("/operator/take") public R crnTake(CrnOperatorParam param){ - if (param.getCrnNo() == null) { - return R.error(BaseRes.PARAM); - } - for (CrnSlave crn : slaveProperties.getCrn()) { - // 鑾峰彇鍫嗗灈鏈轰俊鎭� - if (param.getCrnNo().equals(crn.getId())) { - CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); - if (crnThread == null) { - break; - } - CrnProtocol crnProtocol = crnThread.getCrnProtocol(); - if (crnProtocol == null) { - break; - } - // 绌洪棽鍒ゆ柇 - if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) { - CrnCommand command = new CrnCommand(); - command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� - command.setTaskNo((short) 0); // 宸ヤ綔鍙� - command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� - command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡 - command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 - command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 - command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 - command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� - command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� - if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) { - return R.error("鍛戒护涓嬪彂澶辫触"); - } else { - return R.ok(); - } - } else { - return R.error("鍫嗗灈鏈洪潪绌洪棽鐘舵��"); - } - } - } - return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎"); + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡 + command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 + command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 + command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 + command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� + command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); } @ManagerAuth(memo = "搴撲綅杞Щ") @PostMapping("/operator/stockMove") public R crnStockMove(CrnOperatorParam param){ - if (param.getCrnNo() == null) { - return R.error(BaseRes.PARAM); - } - for (CrnSlave crn : slaveProperties.getCrn()) { - // 鑾峰彇鍫嗗灈鏈轰俊鎭� - if (param.getCrnNo().equals(crn.getId())) { - CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); - if (crnThread == null) { - break; - } - CrnProtocol crnProtocol = crnThread.getCrnProtocol(); - if (crnProtocol == null) { - break; - } - // 绌洪棽鍒ゆ柇 - if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) { - CrnCommand command = new CrnCommand(); - command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� - command.setTaskNo((short) 0); // 宸ヤ綔鍙� - command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� - command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡 - command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 - command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 - command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 - command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� - command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� - if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) { - return R.error("鍛戒护涓嬪彂澶辫触"); - } else { - return R.ok(); - } - } else { - return R.error("鍫嗗灈鏈洪潪绌洪棽鐘舵��"); - } - } - } - return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎"); - } - - @ManagerAuth(memo = "绔欏埌绔�") - @PostMapping("/operator/siteMove") - public R crnSiteMove(CrnOperatorParam param){ - return R.ok("绔欏埌绔欐垚鍔�"); - } - - @ManagerAuth(memo = "鍧愭爣绉诲姩") - @PostMapping("/operator/coorMove") - public R crnCoorMove(CrnOperatorParam param){ - return R.ok("鍧愭爣绉诲姩鎴愬姛"); - } - - @ManagerAuth(memo = "鍥炲師鐐�") - @PostMapping("/operator/bacOrigin") - public R crnBacOrigin(CrnOperatorParam param){ CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� @@ -328,30 +228,154 @@ return crnControl(command)?R.ok():R.error(); } + @ManagerAuth(memo = "绔欏埌绔�") + @PostMapping("/operator/siteMove") + public R crnSiteMove(CrnOperatorParam param){ + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡 + command.setSourcePosX(param.getSourceStaNo()); // 婧愬簱浣嶆帓 + command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 + command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰 + command.setDestinationPosX(param.getStaNo()); // 鐩爣搴撲綅鎺� + command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); + } + + @ManagerAuth(memo = "鍥炲師鐐�") + @PostMapping("/operator/bacOrigin") + public R crnBacOrigin(CrnOperatorParam param){ + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡 + command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓 + command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 + command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰 + command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺� + command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); + } + + @ManagerAuth(memo = "鍙嶅師鐐�") + @PostMapping("/operator/reverseOrigin") + public R reverseOrigin(CrnOperatorParam param){ + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡 + command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓 + command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 + command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰 + command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺� + command.setDestinationPosY((short) 34); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ((short) 5); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); + } + + @ManagerAuth(memo = "鍧愭爣绉诲姩") + @PostMapping("/operator/coorMove") + public R crnCoorMove(CrnOperatorParam param){ + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡 + command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 + command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 + command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 + command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� + command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "浠诲姟瀹屾垚") @PostMapping("/operator/taskComplete") public R crnTaskComplete(CrnOperatorParam param){ - return R.ok("浠诲姟瀹屾垚"); + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡 + command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓 + command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 + command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰 + command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺� + command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); } - @ManagerAuth(memo = "鏆傚仠") - @PostMapping("/operator/pause") - public R crnPause(CrnOperatorParam param){ - return R.ok("鏆傚仠鎴愬姛"); - } - - @ManagerAuth(memo = "鍚姩") - @PostMapping("/operator/boot") - public R crnBoot(CrnOperatorParam param){ - return R.ok("鍚姩鎴愬姛"); - } +// @ManagerAuth(memo = "鏆傚仠") +// @PostMapping("/operator/pause") +// public R crnPause(CrnOperatorParam param){ +// return R.ok("鏆傚仠鎴愬姛"); +// } +// +// @ManagerAuth(memo = "鍚姩") +// @PostMapping("/operator/boot") +// public R crnBoot(CrnOperatorParam param){ +// return R.ok("鍚姩鎴愬姛"); +// } @ManagerAuth(memo = "娓呴櫎鍛戒护") @PostMapping("/operator/clearCommand") public R crnClearCommand(CrnOperatorParam param){ + if (param.getCrnNo() == null) { + throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); + } + MessageQueue.clear(SlaveType.Crn, param.getCrnNo()); return R.ok("娓呴櫎鍛戒护鎴愬姛"); } + @ManagerAuth(memo = "鎵嬪姩澶嶄綅") + @PostMapping("/operator/handleReset") + public R handleReset(CrnOperatorParam param) throws Exception { + if (param.getCrnNo() == null) { + throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); + } + // 鑾峰彇鍫嗗灈鏈虹紦瀛� + for (CrnSlave crn : slaveProperties.getCrn()) { + // 鑾峰彇鍫嗗灈鏈轰俊鎭� + if (param.getCrnNo().equals(crn.getId())) { + CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); + if (crnThread == null) { + throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎"); + } + CrnProtocol crnProtocol = crnThread.getCrnProtocol(); + if (crnProtocol == null) { + throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎"); + } + // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣� + if (crnProtocol.getCrnError3().leftTakeNoneErr + || crnProtocol.getCrnError3().rightTakeNoneErr + || crnProtocol.getCrnError3().leftTakeThenLoadErr + || crnProtocol.getCrnError3().rightTakeThenLoadErr) { + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡 + // 寤舵椂鍙戦�� + Thread.sleep(3000L); + if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) { + return R.ok(); + } else { + throw new CoolException("鍛戒护涓嬪彂澶辫触"); + } + } + } + } + + return R.error(); + } + private boolean crnControl(CrnCommand command){ if (command.getCrnNo() == null) { throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); -- Gitblit v1.9.1