From 04566447a5206fc3df5b3f5250247cd546d6b883 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 16:44:29 +0800
Subject: [PATCH] 'commit'

---
 .../base/DataEase/Model/DataEaseModel.java    | 10 ++++---
 .../base/DataEase/Util/CopyBigScreen.java     | 30 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
index aefd8502..f6eff43f 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -683,8 +683,10 @@ public class DataEaseModel {
             for (Object key : jsonObject.keySet()) {
                 Object value = jsonObject.get(key);
                 if (value.equals("null")) value = null;
+                if (value == null || value.equals("")) value = null;
                 record.set(key.toString(), value);
             }
+            record.set("id", i + 1);
             list.add(record);
         }
         Db.use(DB_NAME).batchSave(tableName, list, 100);
@@ -786,7 +788,7 @@ public class DataEaseModel {
 
                 if ((StrKit.isBlank(value.trim()))) {
                     record.set(colName, null);
-                } else if (colName.contains("数值") ) {
+                } else if (colName.contains("数值")) {
                     //去掉非数字
                     record.set(colName, value.trim().replaceAll("[^\\d.]", ""));
                 } else if (isInteger(value)) {
@@ -879,10 +881,10 @@ public class DataEaseModel {
 
     public String getCityNameByAreaName(String areaName) {
         String sql = "select id,parent_id from t_dm_area where area_name=?";
-        Record record= Db.findFirst(sql, areaName);
-        if(record==null) return null;
+        Record record = Db.findFirst(sql, areaName);
+        if (record == null) return null;
         String parent_id = record.getStr("parent_id");
-        if(parent_id==null) return null;
+        if (parent_id == null) return null;
         return getAreaById(parent_id).getStr("area_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 224783ad..c86676a0 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java
@@ -155,9 +155,7 @@ public class CopyBigScreen {
      * @param dataVisualizationNameCity
      */
     public static void copyCityScreen(String dataVisualizationNameCity) throws InterruptedException {
-        //清理掉旧的数据
-        clearScreen(dataVisualizationNameCity);
-        //母屏信息
+       //母屏信息
         Record motherRecord = getVisualizationByName(dataVisualizationNameCity);
         long motherId = motherRecord.getLong("id");//母屏ID
         long pid = motherRecord.getLong("pid");  //隶属文件夹
@@ -249,8 +247,7 @@ public class CopyBigScreen {
      * @param dataVisualizationProvince 省级大屏的名称
      */
     public static void copyProvinceScreen(String dataVisualizationProvince) throws InterruptedException {
-        //清理掉旧的数据
-        clearScreen(dataVisualizationProvince);
+
         //母屏信息
         Record motherRecord = getVisualizationByName(dataVisualizationProvince);
         long motherId = motherRecord.getLong("id");//母屏ID
@@ -292,17 +289,22 @@ public class CopyBigScreen {
         LocalMysqlConnectUtil.Init();
         //获取省级大屏名称
         String dataVisualizationProvince = LocalMysqlConnectUtil.PropKit.get("dataEase.dataVisualizationProvince");
+        //清理掉旧的数据
+        clearScreen(dataVisualizationProvince);
         //获取市州级大屏名称
         String dataVisualizationNameCity = LocalMysqlConnectUtil.PropKit.get("dataEase.dataVisualizationNameCity");
+        //清理掉旧的数据
+        clearScreen(dataVisualizationNameCity);
+
         //拷贝省级大屏
-        copyProvinceScreen(dataVisualizationProvince);
-        //拷贝市州级大屏
-        copyCityScreen(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("恭喜，所有操作成功完成~~~");
+//        copyProvinceScreen(dataVisualizationProvince);
+//        //拷贝市州级大屏
+//        copyCityScreen(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("恭喜，所有操作成功完成~~~");
     }
 }