From 83bd7c8d6c8322a9beb0944c1c4fd22269b34da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 17 Dec 2024 16:46:55 +0800
Subject: [PATCH] 'commit'

---
 .../dsideal/base/DataEase/Controller/DataEaseController.java  | 4 ++--
 .../Util/{DeleteBigScreen.java => Step1_DeleteBigScreen.java} | 4 ++--
 ...rParamsScreenToFilterScreen.java => Step2_CopyFilter.java} | 3 +--
 .../Util/{CopyBigScreen.java => Step3_CopyBigScreen.java}     | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename src/main/java/com/dsideal/base/DataEase/Util/{DeleteBigScreen.java => Step1_DeleteBigScreen.java} (85%)
 rename src/main/java/com/dsideal/base/DataEase/Util/{CopyOuterParamsScreenToFilterScreen.java => Step2_CopyFilter.java} (96%)
 rename src/main/java/com/dsideal/base/DataEase/Util/{CopyBigScreen.java => Step3_CopyBigScreen.java} (97%)

diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
index 8591a66b..deab9bb0 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -5,7 +5,7 @@ import com.dsideal.base.BaseApplication;
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.DataEase.Model.ExcelReader;
 import com.dsideal.base.DataEase.Model.ExcelRow;
-import com.dsideal.base.DataEase.Util.CopyBigScreen;
+import com.dsideal.base.DataEase.Util.Step3_CopyBigScreen;
 import com.dsideal.base.Interceptor.EmptyInterface;
 import com.dsideal.base.Interceptor.IsLoginInterface;
 import com.dsideal.base.Interceptor.IsNumericInterface;
@@ -80,7 +80,7 @@ public class DataEaseController extends Controller {
         //发布的地址
         String publish_url = BaseApplication.PropKit.get("dataEase.publish_url");
         //共享地址
-        String shareUrl = CopyBigScreen.getCityShare(dataVisualizationNameCity, city_name);
+        String shareUrl = Step3_CopyBigScreen.getCityShare(dataVisualizationNameCity, city_name);
         System.out.println("city_name=" + city_name + ",shareUrl=" + shareUrl);
         //拼接一下URL的最终地址
         JSONObject jo = new JSONObject();
diff --git a/src/main/java/com/dsideal/base/DataEase/Util/DeleteBigScreen.java b/src/main/java/com/dsideal/base/DataEase/Util/Step1_DeleteBigScreen.java
similarity index 85%
rename from src/main/java/com/dsideal/base/DataEase/Util/DeleteBigScreen.java
rename to src/main/java/com/dsideal/base/DataEase/Util/Step1_DeleteBigScreen.java
index 9681f767..67da9c2b 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/DeleteBigScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/Step1_DeleteBigScreen.java
@@ -2,9 +2,9 @@ package com.dsideal.base.DataEase.Util;
 
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 
-import static com.dsideal.base.DataEase.Util.CopyBigScreen.clearScreen;
+import static com.dsideal.base.DataEase.Util.Step3_CopyBigScreen.clearScreen;
 
-public class DeleteBigScreen {
+public class Step1_DeleteBigScreen {
 
     public static void main(String[] args) throws InterruptedException {
         //连接本地数据库系统
diff --git a/src/main/java/com/dsideal/base/DataEase/Util/CopyOuterParamsScreenToFilterScreen.java b/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
similarity index 96%
rename from src/main/java/com/dsideal/base/DataEase/Util/CopyOuterParamsScreenToFilterScreen.java
rename to src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
index 8275ff58..45f85993 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/CopyOuterParamsScreenToFilterScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
@@ -1,7 +1,6 @@
 package com.dsideal.base.DataEase.Util;
 
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
@@ -15,7 +14,7 @@ import java.util.List;
 
 import static com.dsideal.base.DataEase.Model.DataEaseModel.DB_NAME;
 
-public class CopyOuterParamsScreenToFilterScreen {
+public class Step2_CopyFilter {
     //DataEase部署的地址
     public static String urlPrefix = "http://10.10.14.203";
 
diff --git a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java b/src/main/java/com/dsideal/base/DataEase/Util/Step3_CopyBigScreen.java
similarity index 97%
rename from src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
rename to src/main/java/com/dsideal/base/DataEase/Util/Step3_CopyBigScreen.java
index 2fa2d1f1..7618c1d6 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/Step3_CopyBigScreen.java
@@ -14,7 +14,7 @@ import java.util.*;
 
 import static com.dsideal.base.DataEase.Model.DataEaseModel.DB_NAME;
 
-public class CopyBigScreen {
+public class Step3_CopyBigScreen {
     //DataEase部署的地址
     public static String urlPrefix = "http://10.10.14.203";