From 8997c746fee4bdfa4847328f31e228f2c7c48031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 16 Dec 2024 09:18:22 +0800
Subject: [PATCH] 'commit'

---
 .../base/DataEase/Controller/DataEaseController.java   |  1 +
 .../com/dsideal/base/DataEase/Util/CopyBigScreen.java  | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

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 98105eea..8591a66b 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -81,6 +81,7 @@ public class DataEaseController extends Controller {
         String publish_url = BaseApplication.PropKit.get("dataEase.publish_url");
         //共享地址
         String shareUrl = CopyBigScreen.getCityShare(dataVisualizationNameCity, city_name);
+        System.out.println("city_name=" + city_name + ",shareUrl=" + shareUrl);
         //拼接一下URL的最终地址
         JSONObject jo = new JSONObject();
         jo.put("city_name", city_name);
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 708ea22f..7f237d71 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
@@ -110,6 +110,7 @@ public class CopyBigScreen {
         jo.put("pid", pid);
         String res = HttpUtil.createPost(url).contentType("application/json")
                 .header("x-de-token", getToken()).body(jo.toString()).execute().body();
+        System.out.println(res);
         long childId = Long.parseLong(JSONObject.parseObject(res).getString("data"));
 
         //更新pid,没有这步的话，在界面上看不到拷贝出来的大屏！
@@ -192,7 +193,7 @@ public class CopyBigScreen {
             publishShare(motherShareRecord, childId);
             System.out.println((i + 1) + "、" + cityName + "修改完成,共" + (list.size()) + "个。");
         }
-        System.out.println(list.size()+"个城市大屏拷贝完成！");
+        System.out.println(list.size() + "个城市大屏拷贝完成！");
     }
 
     /**
@@ -200,7 +201,7 @@ public class CopyBigScreen {
      *
      * @param dataVisualizationProvince 省级大屏的名称
      */
-    public static long copyProvinceScreen(String dataVisualizationProvince) {
+    public static void copyProvinceScreen(String dataVisualizationProvince) {
         //清理掉旧的数据
         clearScreen(dataVisualizationProvince);
         //母屏信息
@@ -219,7 +220,6 @@ public class CopyBigScreen {
         //发布共享链接
         publishShare(motherShareRecord, childId);
         System.out.println("省级大屏拷贝完成！");
-        return motherId;
     }
 
     /**
@@ -252,10 +252,10 @@ public class CopyBigScreen {
         //拷贝市州级大屏
         copyCityScreen(dataVisualizationNameCity);
         //更新复制出的省级大屏的链接路由
-        Record motherRecord = getVisualizationByName(dataVisualizationNameCity);
+        Record motherRecord = getVisualizationByName(dataVisualizationProvince + "【黄海】");
         long motherId = motherRecord.getLong("id");//母屏ID
         String sql = "update visualization_link_jump_info set content=REPLACE(content,'/dsBase/dataease/route?city_name=','/dsBase/dataease/routeV2?city_name=') where  link_jump_id in (select id from visualization_link_jump where source_dv_id=?)";
         Db.use(DB_NAME).update(sql, motherId);
-        System.out.println("恭喜，所有操作成功完成！");
+        System.out.println("恭喜，所有操作成功完成~~~");
     }
 }