From da16ad74ac7b2650edb502b10c40b8b22fd1cb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Thu, 5 Sep 2024 17:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=B6=E8=8A=82=E7=82=B9=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E5=B0=B1=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/quest/utils/NodeUtils.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java index d5528b7..8e55859 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java @@ -100,14 +100,20 @@ public class NodeUtils { nodeTypeList.forEach(nodeType -> { // 根据节点类型查询对应类型节点 List nodes = nodeMapAll.get(nodeType.getNodeTypeCode()); + Integer maxNum = nodeType.getNodeMaxNum(); Integer minNum = nodeType.getNodeMinNum(); - int num = nodes.size(); - if (minNum != -1 && num < minNum){ + if (!nodes.isEmpty()){ + int num = nodes.size(); + if (minNum != -1 && num < minNum){ + throw new TaskException("节点 " + nodeType.getNodeTypeName() + " 数量不足,至少需要 " + minNum + " 个"); + }else if (maxNum != -1 && num > maxNum){ + throw new TaskException("节点 " + nodeType.getNodeTypeName() + " 数量超出范围,最多允许 " + maxNum + " 个"); + } + }else if (minNum != -1){ throw new TaskException("节点 " + nodeType.getNodeTypeName() + " 数量不足,至少需要 " + minNum + " 个"); - }else if (maxNum != -1 && num > maxNum){ - throw new TaskException("节点 " + nodeType.getNodeTypeName() + " 数量超出范围,最多允许 " + maxNum + " 个"); } + }); }