From b8387a8ae81425d24bb104fd9ecb2a9191f12c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sat, 14 Dec 2024 10:00:13 +0800
Subject: [PATCH] 'commit'

---
 .../base/DataEase/Util/CopyBigScreen.java     | 35 ++-----------------
 .../com/dsideal/base/Util/CommonUtil.java     | 33 +++++++++++++++++
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java b/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
index 14ae7028..1a04f812 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
@@ -6,6 +6,7 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.CommonUtil;
 import com.dsideal.base.Util.FileUtil;
 import com.jfinal.kit.PathKit;
 import com.jfinal.plugin.activerecord.Db;
@@ -36,35 +37,6 @@ public class CopyBigScreen {
         return JSONObject.parseObject(res).getJSONObject("data").getString("token");
     }
 
-    /**
-     * 利用雪花算法获取唯一ID
-     *
-     * @return
-     */
-    public static long getSnowId() {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        return snowflake.nextId();
-    }
-
-    /**
-     * 生成随机字符串
-     *
-     * @param len
-     * @return
-     */
-    static String randomString(int len) {
-        String alphabetsInUpperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        String alphabetsInLowerCase = "abcdefghijklmnopqrstuvwxyz";
-        String numbers = "0123456789";
-        String allCharacters = alphabetsInLowerCase + alphabetsInUpperCase + numbers;
-        StringBuilder randomString = new StringBuilder();
-        Random random = new Random();
-        for (int i = 0; i < len; i++) {
-            int randomIndex = random.nextInt(allCharacters.length());
-            randomString.append(allCharacters.charAt(randomIndex));
-        }
-        return randomString.toString();
-    }
 
     /**
      * 清理通过本程序生成的所有副本，为了再次生成不重复
@@ -179,12 +151,11 @@ public class CopyBigScreen {
             cityParamsInfoRecord.set("params_id", cityOuterParamsRecord.getStr("params_id"));
             cityParamsInfoRecord.set("params_info_id", UUID.randomUUID().toString());
             Db.use(DB_NAME).save("visualization_outer_params_info", "params_info_id", cityParamsInfoRecord);
-
             //发布共享链接
             Record shareRecord = new Record().setColumns(motherShareRecord);
             shareRecord.set("resource_id", childId);
-            shareRecord.set("id", getSnowId());
-            shareRecord.set("uuid", randomString(8));//大小写字母和数字组合，长度为8
+            shareRecord.set("id", CommonUtil.getSnowId());
+            shareRecord.set("uuid", CommonUtil.randomString(8));//大小写字母和数字组合，长度为8
             Db.use(DataEaseModel.DB_NAME).save("xpack_share", "id", shareRecord);
             System.out.println(cityName + "修改完成");
         }
diff --git a/src/main/java/com/dsideal/base/Util/CommonUtil.java b/src/main/java/com/dsideal/base/Util/CommonUtil.java
index 029358c0..c7bd66b9 100644
--- a/src/main/java/com/dsideal/base/Util/CommonUtil.java
+++ b/src/main/java/com/dsideal/base/Util/CommonUtil.java
@@ -1,6 +1,8 @@
 package com.dsideal.base.Util;
 
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.base.BaseApplication;
@@ -495,4 +497,35 @@ public class CommonUtil {
         String base64Rule = "^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)$";
         return Pattern.matches(base64Rule, str);
     }
+
+
+    /**
+     * 利用雪花算法获取唯一ID
+     *
+     * @return
+     */
+    public static long getSnowId() {
+        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+        return snowflake.nextId();
+    }
+
+    /**
+     * 生成随机字符串
+     *
+     * @param len
+     * @return
+     */
+    public static String randomString(int len) {
+        String alphabetsInUpperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        String alphabetsInLowerCase = "abcdefghijklmnopqrstuvwxyz";
+        String numbers = "0123456789";
+        String allCharacters = alphabetsInLowerCase + alphabetsInUpperCase + numbers;
+        StringBuilder randomString = new StringBuilder();
+        Random random = new Random();
+        for (int i = 0; i < len; i++) {
+            int randomIndex = random.nextInt(allCharacters.length());
+            randomString.append(allCharacters.charAt(randomIndex));
+        }
+        return randomString.toString();
+    }
 }