From ce641926a957d238b202aa0d9dac3b8f15aff153 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期三, 14 五月 2025 14:43:00 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/controller/CrnController.java | 82 ++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java index d1f80c2..3cd023a 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/src/main/java/com/zy/asrs/controller/CrnController.java @@ -1,7 +1,7 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.core.annotations.ManagerAuth; import com.core.common.Cools; import com.core.common.R; @@ -26,7 +26,6 @@ import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; import com.zy.core.cache.SlaveConnection; -import com.zy.core.enums.CrnLiftPosType; import com.zy.core.enums.CrnModeType; import com.zy.core.enums.CrnTaskModeType; import com.zy.core.enums.SlaveType; @@ -102,7 +101,7 @@ @ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃") public R crnStateTable(){ List<CrnStateTableVo> list = new ArrayList<>(); - List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no")); + List<BasCrnp> crnps = basCrnpService.list(new QueryWrapper<BasCrnp>().orderByAsc("crn_no")); for (BasCrnp basCrnp : crnps) { // 琛ㄦ牸琛� CrnStateTableVo vo = new CrnStateTableVo(); @@ -118,54 +117,20 @@ continue; } vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙� -// if (crnProtocol.getTaskNo()>0) { -// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); -// if (wrkMast != null) { -// vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵�� -// } -// } else { -// -// } vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵�� - if (crnProtocol.getTaskFinish() == 1) { - vo.setStatus("绛夊緟纭"); - } else { - vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵�� - } + vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵�� vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿 vo.setBay(crnProtocol.getBay()); // 鍒� vo.setLev(crnProtocol.getLevel()); // 灞� - vo.setLiftPos(crnProtocol.getLiftPosType().desc); - if (crnProtocol.getPlatformHigh()) { - vo.setSitePos("绔欏彴楂樹綅"); - } - if (crnProtocol.getPlatformLow()) { - vo.setSitePos("绔欏彴楂樹綅"); - } - vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆 - vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅 - vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅 - if (crnProtocol.getAlarm1() > 0) { - BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1()); - vo.setAlarm1(crnError==null?"鏈煡寮傚父":crnError.getErrName()); - } - if (crnProtocol.getAlarm2() > 0) { - BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm2()); - vo.setAlarm2(crnError==null?"鏈煡寮傚父":crnError.getErrName()); - } - if (crnProtocol.getAlarm3() > 0) { - BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm3()); - vo.setAlarm3(crnError==null?"鏈煡寮傚父":crnError.getErrName()); - } - if (crnProtocol.getAlarm4() > 0) { - BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm4()); - vo.setAlarm4(crnError==null?"鏈煡寮傚父":crnError.getErrName()); - } -// vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1())); -// vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2())); -// vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3())); -// vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4())); + vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆 + vo.setLiftPos(crnProtocol.getLiftPosType().desc); + vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�"); + vo.setWarnCode(String.valueOf(crnProtocol.getAlarm())); + if (crnProtocol.getAlarm() > 0) { + BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm()); + vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName()); + } } return R.ok().add(list); } @@ -174,7 +139,7 @@ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃") public R crnMsgTable(){ List<CrnMsgTableVo> list = new ArrayList<>(); - List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no")); + List<BasCrnp> crnps = basCrnpService.list(new QueryWrapper<BasCrnp>().orderByAsc("crn_no")); for (BasCrnp basCrnp : crnps) { // 琛ㄦ牸琛� CrnMsgTableVo vo = new CrnMsgTableVo(); @@ -192,7 +157,7 @@ vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙� if (crnProtocol.getTaskNo()>0) { - WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); + WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo()); if (wrkMast != null) { vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵�� vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯 @@ -317,9 +282,9 @@ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� - LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX()) + LocMast sourceLoc = locMastService.getOne(new QueryWrapper<LocMast>().eq("row1", command.getSourcePosX()) .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ())); - LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX()) + LocMast loc = locMastService.getOne(new QueryWrapper<LocMast>().eq("row1", command.getDestinationPosX()) .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ())); VersionUtils.locMoveCheckLocType(sourceLoc, loc); return crnControl(command)?R.ok():R.error(); @@ -332,7 +297,7 @@ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� - command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡 + command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡 command.setSourcePosX(param.getSourceStaNo()); // 婧愬簱浣嶆帓 command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰 @@ -429,8 +394,18 @@ if (param.getCrnNo() == null) { throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); } - MessageQueue.clear(SlaveType.Crn, param.getCrnNo()); - return R.ok("娓呴櫎鍛戒护鎴愬姛"); + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + 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 = "鎵嬪姩澶嶄綅") @@ -455,6 +430,7 @@ crnCommand.setCrnNo(crn.getId()); // 鍫嗗灈鏈虹紪鍙� crnCommand.setTaskMode(CrnTaskModeType.CLEAR); crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + crnCommand.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣� // 寤舵椂鍙戦�� Thread.sleep(1000L); if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) { -- Gitblit v1.9.1