From 46631c491386ae287bf672feed81ebdc6529e412 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 18 Jun 2024 18:16:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhgd/xmgl/util/NumberUtils.java  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/util/NumberUtils.java b/src/main/java/com/zhgd/xmgl/util/NumberUtils.java
index ba5966333..be0cd6703 100644
--- a/src/main/java/com/zhgd/xmgl/util/NumberUtils.java
+++ b/src/main/java/com/zhgd/xmgl/util/NumberUtils.java
@@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Slf4j
 public class NumberUtils {
@@ -98,7 +100,7 @@ public class NumberUtils {
      * @return
      */
     public static Integer mod(Integer b1, Integer b2) {
-        if (b1 == null || b2 == null) {
+        if (b1 == null || b2 == null || b2.equals(0)) {
             return null;
         }
         return b1 % b2;
@@ -192,4 +194,21 @@ public class NumberUtils {
         System.out.println(randomNum(6));
     }
 
+    /**
+     * 获取字符串中的第一个数字
+     *
+     * @param str
+     * @return
+     */
+    public static int getFirstNumberInStr(String str) {
+        String regex = "\\d+"; // 匹配一个或多个数字
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(str);
+
+        if (matcher.find()) {
+            return Integer.parseInt(matcher.group());
+        }
+
+        return -1;
+    }
 }