From e29a9f245ff4e57a40bbab1c0acc3cbc31d3ac2b Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 21 四月 2025 11:13:13 +0800 Subject: [PATCH] #出库找待机位优化 --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 299 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 152 insertions(+), 147 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java index 2669988..986237a 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java @@ -10,10 +10,7 @@ import com.zy.asrs.wcs.core.entity.BasShuttle; import com.zy.asrs.wcs.core.entity.Loc; import com.zy.asrs.wcs.core.model.NavigateNode; -import com.zy.asrs.wcs.core.model.command.LiftAssignCommand; -import com.zy.asrs.wcs.core.model.command.LiftCommand; -import com.zy.asrs.wcs.core.model.command.ShuttleAssignCommand; -import com.zy.asrs.wcs.core.model.command.ShuttleCommand; +import com.zy.asrs.wcs.core.model.command.*; import com.zy.asrs.wcs.core.model.enums.*; import com.zy.asrs.wcs.core.service.BasShuttleService; import com.zy.asrs.wcs.core.service.LocService; @@ -22,7 +19,7 @@ import com.zy.asrs.wcs.rcs.News; import com.zy.asrs.wcs.rcs.cache.SlaveConnection; import com.zy.asrs.wcs.core.entity.Motion; -import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant; +import com.zy.asrs.wcs.rcs.entity.Device; import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType; import com.zy.asrs.wcs.rcs.model.enums.SlaveType; import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol; @@ -61,6 +58,10 @@ private ShuttleAction shuttleAction; @Autowired private LiftAction liftAction; + @Autowired + private LiftDispatcher liftDispatcher; + @Autowired + private ShuttleDispatcher shuttleDispatcher; // 璁$畻 public Boolean accept(Motion motion) { @@ -73,9 +74,19 @@ if (null == shuttleProtocol) { return false; } - if (!shuttleThread.isIdle()) {//璁惧涓嶇┖闂� + Device shuttleDevice = shuttleThread.getDevice(); + if (!shuttleThread.isIdle(new ExecuteSupport() { + @Override + public Boolean judgement() { + if (Objects.equals(MotionCtgType.get(motion.getMotionCtgEl()), MotionCtgType.SHUTTLE_CHARGE_OFF)) {//闈炲叧闂厖鐢祄otion锛岄渶瑕佸垽鏂澶囩姸鎬� + return false;//涓嶉渶瑕佸垽鏂姸鎬� + } + return true;//闇�瑕佸垽鏂姸鎬� + } + })) {//璁惧涓嶇┖闂� return false; } + if (motionService.count(new LambdaQueryWrapper<Motion>() .eq(Motion::getDeviceCtg, DeviceCtgType.SHUTTLE.val()) .eq(Motion::getDevice, motion.getDevice()) @@ -131,11 +142,11 @@ } // 鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂� - if (!liftThread.isIdle()) { + if (!liftThread.isIdle(MotionCtgType.SHUTTLE_MOVE_FROM_LIFT)) { return false; } - if (liftProtocol.getLev() != Utils.getLev(motion.getTarget())) {//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁揪鍒扮洰鏍囧眰 + if (liftProtocol.getLev() != liftDispatcher.getLiftLevOffset(liftThread.getDevice().getId().intValue(), Utils.getLev(motion.getTarget()))) {//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁揪鍒扮洰鏍囧眰 return false; } @@ -146,26 +157,15 @@ return true; } })) { - //閿佸畾鎻愬崌鏈� - LiftCommand lockCommand = liftThread.getLockCommand(motion.getTaskNo(), true);//鑾峰彇鎻愬崌鏈洪攣瀹氬懡浠� - - LiftAssignCommand liftAssignCommand = new LiftAssignCommand(); - liftAssignCommand.setLiftNo(liftThread.getStatus().getLiftNo()); - liftAssignCommand.setTaskNo(motion.getTaskNo()); - ArrayList<LiftCommand> list = new ArrayList<>(); - list.add(lockCommand); - liftAssignCommand.setCommands(list); - - liftAction.assignWork(liftThread.getDevice(), liftAssignCommand); - return false;//绛夊緟涓嬩竴娆¤疆璇� - } - - //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� - if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { return false; } - shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread); +// //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� +// if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { +// return false; +// } + + shuttleCommands = this.shuttleInOutLiftCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread); shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO; break; case SHUTTLE_MOVE_TO_LIFT://杩涙彁鍗囨満 @@ -179,11 +179,11 @@ return false; } // 鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂� - if (!liftThread.isIdle()) { + if (!liftThread.isIdle(MotionCtgType.SHUTTLE_MOVE_TO_LIFT)) { return false; } - if (liftProtocol.getLev() != Utils.getLev(motion.getTarget())) {//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁揪鍒扮洰鏍囧眰 + if (liftProtocol.getLev() != liftDispatcher.getLiftLevOffset(liftThread.getDevice().getId().intValue(), Utils.getLev(motion.getTarget()))) {//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁揪鍒扮洰鏍囧眰 return false; } @@ -191,30 +191,16 @@ if (!liftThread.isLock(new ExecuteSupport() { @Override public Boolean judgement() { - return true; + return true;//鐗涚溂娌℃湁鎻愬崌鏈洪攣锛岀洿鎺ヨ繑鍥瀟rue } })) { - //閿佸畾鎻愬崌鏈� - LiftCommand lockCommand = liftThread.getLockCommand(motion.getTaskNo(), true);//鑾峰彇鎻愬崌鏈洪攣瀹氬懡浠� - if (lockCommand == null) { - return false; - } - - LiftAssignCommand liftAssignCommand = new LiftAssignCommand(); - liftAssignCommand.setLiftNo(liftThread.getStatus().getLiftNo()); - liftAssignCommand.setTaskNo(motion.getTaskNo()); - ArrayList<LiftCommand> list = new ArrayList<>(); - list.add(lockCommand); - liftAssignCommand.setCommands(list); - - liftAction.assignWork(liftThread.getDevice(), liftAssignCommand); - return false;//绛夊緟涓嬩竴娆¤疆璇� - } - - //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� - if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { return false; } + +// //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� +// if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { +// return false; +// } shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread); shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO; @@ -237,6 +223,25 @@ shuttleTaskModeType = ShuttleTaskModeType.PALLET_DOWN; shuttleCommands.add(shuttleThread.getLiftCommand(motion.getTaskNo(), false)); break; + case SHUTTLE_UPDATE_LOCATION://灏忚溅鍧愭爣鏇存柊 + shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_UPDATE_LOCATION; + shuttleCommands.add(shuttleThread.getUpdateLocationCommand(motion.getTaskNo(), motion.getTarget())); + break; + case SHUTTLE_MOVE_STANDBY://绌挎杞︾Щ鍔ㄥ埌寰呮満浣� + shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO; + + //鑾峰彇鍏ㄩ儴寰呮満浣� + List<String> standbyLocs = JSON.parseArray(motion.getTemp(), String.class); + //鑾峰彇鍙敤寰呮満浣� + String shuttleFromLiftStandbyLoc = shuttleDispatcher.searchAvailableLocNo(Integer.valueOf(shuttleDevice.getDeviceNo()), shuttleDevice.getHostId(), shuttleThread.getStatus().getCurrentLocNo(), standbyLocs); + shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), shuttleFromLiftStandbyLoc, NavigationMapType.NORMAL.id, assignCommand, shuttleThread); + + //鏇存柊鍔ㄤ綔鍙敤寰呮満浣� + motion.setTarget(shuttleFromLiftStandbyLoc); + motion.setUpdateTime(new Date()); + motionService.updateById(motion); + + break; default: throw new CoolException(motion.getMotionCtgEl() + "娌℃湁鎸囧畾浠诲姟浣滀笟娴佺▼锛侊紒锛�"); } @@ -251,7 +256,7 @@ if (motion.getOrigin() != null && motion.getTarget() != null) { //鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢� - boolean lockResult = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(motion.getTarget()), shuttleProtocol.getShuttleNo(), assignCommand.getNodes(), true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢� + boolean lockResult = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(motion.getTarget()), shuttleProtocol.getShuttleNo(), assignCommand.getNodesDeepCopy(), true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢� if (!lockResult) { return false;//閿佸畾澶辫触 } @@ -275,11 +280,13 @@ //鍏呯數浠诲姟 if (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl())).equals(MotionCtgType.SHUTTLE_CHARGE_ON)) { - // 澶嶄綅绌挎杞� - shuttleThread.setSyncTaskNo(0); - shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE); - shuttleThread.setPakMk(true); - return true; + if (shuttleProtocol.getHasCharge() || shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.CHARGING_WAITING)) { + // 澶嶄綅绌挎杞� + shuttleThread.setSyncTaskNo(0); + shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE); + shuttleThread.setPakMk(true); + return true; + } } if (!shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.WAITING) @@ -318,53 +325,24 @@ } //鍒ゆ柇鎻愬崌鏈烘槸鍚﹁閿佸畾 - if (liftThread.isLock(new ExecuteSupport() { + if (!liftThread.isLock(new ExecuteSupport() { @Override public Boolean judgement() { return false; } })) { - //瑙i攣鎻愬崌鏈� - LiftCommand lockCommand = liftThread.getLockCommand(motion.getTaskNo(), false);//鑾峰彇鎻愬崌鏈鸿В閿佸懡浠� - - LiftAssignCommand liftAssignCommand = new LiftAssignCommand(); - liftAssignCommand.setLiftNo(liftThread.getStatus().getLiftNo()); - liftAssignCommand.setTaskNo(motion.getTaskNo()); - ArrayList<LiftCommand> list = new ArrayList<>(); - list.add(lockCommand); - liftAssignCommand.setCommands(list); - - liftAction.assignWork(liftThread.getDevice(), liftAssignCommand); - return false;//绛夊緟涓嬩竴娆¤疆璇� - } - - //鍒ゆ柇灏忚溅鏄惁宸插埌浣� - if (liftProtocol.getHasCar()) { - LiftCommand signalCommand = liftThread.getShuttleSignalCommand(motion.getTaskNo(), true);//鑾峰彇灏忚溅宸插埌浣嶅懡浠� - if(signalCommand != null) { - boolean hasKey = redisUtil.hasKey(DeviceRedisConstant.COMMAND_TMP + motion.getTaskNo()); - if (!hasKey) { - LiftAssignCommand liftAssignCommand = new LiftAssignCommand(); - liftAssignCommand.setLiftNo(liftThread.getStatus().getLiftNo()); - liftAssignCommand.setTaskNo(motion.getTaskNo()); - ArrayList<LiftCommand> list = new ArrayList<>(); - list.add(signalCommand); - liftAssignCommand.setCommands(list); - liftAction.assignWork(liftThread.getDevice(), liftAssignCommand); - return false; - } - } - } - - //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� - if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { return false; } - if (liftProtocol.getTaskNo() != 0) { - //娓呯┖鎻愬崌鏈哄彿 - liftThread.setSyncTaskNo(0); + //鍒ゆ柇灏忚溅鏄惁宸插埌浣� + if (!liftProtocol.getHasCar()) { + return false; } + +// //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� +// if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { +// return false; +// } break; case SHUTTLE_MOVE_FROM_LIFT: liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, Integer.parseInt(motion.getTemp())); @@ -378,54 +356,24 @@ } //鍒ゆ柇鎻愬崌鏈烘槸鍚﹁閿佸畾 - if (liftThread.isLock(new ExecuteSupport() { + if (!liftThread.isLock(new ExecuteSupport() { @Override public Boolean judgement() { return false; } })) { - //瑙i攣鎻愬崌鏈� - LiftCommand lockCommand = liftThread.getLockCommand(motion.getTaskNo(), false);//鑾峰彇鎻愬崌鏈鸿В閿佸懡浠� - - LiftAssignCommand liftAssignCommand = new LiftAssignCommand(); - liftAssignCommand.setLiftNo(liftThread.getStatus().getLiftNo()); - liftAssignCommand.setTaskNo(motion.getTaskNo()); - ArrayList<LiftCommand> list = new ArrayList<>(); - list.add(lockCommand); - liftAssignCommand.setCommands(list); - - liftAction.assignWork(liftThread.getDevice(), liftAssignCommand); - return false;//绛夊緟涓嬩竴娆¤疆璇� - } - - //鍒ゆ柇灏忚溅鏄惁宸茬寮� - if (!liftProtocol.getHasCar()) { - LiftCommand signalCommand = liftThread.getShuttleSignalCommand(motion.getTaskNo(), false);//鑾峰彇灏忚溅宸查┚绂诲懡浠� - if(signalCommand != null) { - boolean hasKey = redisUtil.hasKey(DeviceRedisConstant.COMMAND_TMP + motion.getTaskNo()); - if (!hasKey) { - redisUtil.set(DeviceRedisConstant.COMMAND_TMP + motion.getTaskNo(), JSON.toJSONString(signalCommand), 120); - LiftAssignCommand liftAssignCommand = new LiftAssignCommand(); - liftAssignCommand.setLiftNo(liftThread.getStatus().getLiftNo()); - liftAssignCommand.setTaskNo(motion.getTaskNo()); - ArrayList<LiftCommand> list = new ArrayList<>(); - list.add(signalCommand); - liftAssignCommand.setCommands(list); - liftAction.assignWork(liftThread.getDevice(), liftAssignCommand); - return false; - } - } - } - - //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� - if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { return false; } - if (liftProtocol.getTaskNo() != 0) { - //娓呯┖鎻愬崌鏈哄彿 - liftThread.setSyncTaskNo(0); + //鍒ゆ柇灏忚溅鏄惁宸茬寮� + if (liftProtocol.getHasCar()) { + return false; } + +// //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� +// if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { +// return false; +// } break; case SHUTTLE_TRANSPORT_FROM_LIFT: case SHUTTLE_TRANSPORT_TO_LIFT: @@ -447,28 +395,28 @@ return false; } })) { - //瑙i攣鎻愬崌鏈� - LiftCommand lockCommand = liftThread.getLockCommand(motion.getTaskNo(), false);//鑾峰彇鎻愬崌鏈鸿В閿佸懡浠� - - LiftAssignCommand liftAssignCommand = new LiftAssignCommand(); - liftAssignCommand.setLiftNo(liftThread.getStatus().getLiftNo()); - liftAssignCommand.setTaskNo(motion.getTaskNo()); - ArrayList<LiftCommand> list = new ArrayList<>(); - list.add(lockCommand); - liftAssignCommand.setCommands(list); - - liftAction.assignWork(liftThread.getDevice(), liftAssignCommand); - return false;//绛夊緟涓嬩竴娆¤疆璇� + return false; } //鍒ゆ柇鎻愬崌鏈哄伐浣滃彿鏄惁鍜屽綋鍓嶄换鍔$浉鍚� if (liftProtocol.getTaskNo().intValue() != motion.getTaskNo()) { return false; } - - if (liftProtocol.getTaskNo() != 0) { - //娓呯┖鎻愬崌鏈哄彿 - liftThread.setSyncTaskNo(0); + break; + case SHUTTLE_UPDATE_LOCATION://灏忚溅鍧愭爣鏇存柊 + break; + case SHUTTLE_PALLET_LIFT://鎵樼洏椤跺崌 + if (!shuttleProtocol.getHasLift()) { + return false; + } + break; + case SHUTTLE_PALLET_DOWN://鎵樼洏涓嬮檷 + if (shuttleProtocol.getHasLift()) { + return false; + } + case SHUTTLE_MOVE_STANDBY://绌挎杞︾Щ鍔ㄥ埌寰呮満浣� + if (!shuttleProtocol.getCurrentLocNo().equals(motion.getTarget())) { + return false; } break; default: @@ -514,7 +462,64 @@ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮� String distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ(), hostId); //鑾峰彇绉诲姩鍛戒护 - ShuttleCommand command = shuttleThread.getMoveCommand(assignCommand.getDeviceTaskNo(), startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id.intValue(), runSpeed); + ShuttleCommand command = shuttleThread.getMoveCommand(assignCommand.getDeviceTaskNo(), startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id.intValue(), runSpeed, nodes); + command.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑 + commands.add(command); + } + + assignCommand.setNodes(allNode);//褰撳墠浠诲姟鎵�鍗犵敤鐨勮妭鐐筶ist + + return commands; + } + + public synchronized List<ShuttleCommand> shuttleInOutLiftCommand(String startLocNo, String endLocNo, Integer mapType, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread) { + NavigateNode startNode = NavigatePositionConvert.locNoToNode(startLocNo); + NavigateNode endNode = NavigatePositionConvert.locNoToNode(endLocNo); + List<NavigateNode> unlockPath = new ArrayList<>(); + unlockPath.add(startNode); + unlockPath.add(endNode); + + ShuttleProtocol shuttleProtocol = shuttleThread.getStatus(); + + //鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹�/瑙i攣 + boolean lockResult = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(endLocNo), shuttleProtocol.getShuttleNo(), unlockPath, false);//鎵�浣跨敤鐨勮矾寰勮繘琛岃В閿� + if (!lockResult) { + News.error("{} dash {} can't find unlock path!", startLocNo, endLocNo); + return null;//瑙i攣澶辫触 + } + + + //鑾峰彇灏忚溅绉诲姩閫熷害 + Integer runSpeed = Optional.ofNullable(basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>().eq(BasShuttle::getDeviceId, assignCommand.getDeviceId())).getRunSpeed()).orElse(1000); + Long hostId = shuttleThread.getDevice().getHostId(); + List<NavigateNode> nodeList = NavigateUtils.calc(startLocNo, endLocNo, mapType, Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), Utils.getLev(startLocNo))); + if (nodeList == null) { + News.error("{} dash {} can't find navigate path!", startLocNo, endLocNo); + return null; + } + + List<NavigateNode> allNode = new ArrayList<>(); + for (NavigateNode node : nodeList) { + allNode.add(node.clone()); + } + + List<ShuttleCommand> commands = new ArrayList<>(); + //鑾峰彇鍒嗘璺緞 + ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(nodeList); + //灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护 + for (ArrayList<NavigateNode> nodes : data) { + //寮�濮嬭矾寰� + NavigateNode startPath = nodes.get(0); + + //鐩爣璺緞 + NavigateNode endPath = nodes.get(nodes.size() - 1); + Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁$畻褰撳墠璺緞琛岃蛋鎬昏窛绂� + //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮� + String startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ(), hostId); + //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮� + String distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ(), hostId); + //鑾峰彇绉诲姩鍛戒护 + ShuttleCommand command = shuttleThread.getMoveCommand(assignCommand.getDeviceTaskNo(), startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id.intValue(), runSpeed, nodes); command.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑 commands.add(command); } -- Gitblit v1.9.1