Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -32,7 +32,7 @@ public class DataEaseModel {
      * @return 数据集列表
      */
     public List<Record> getDataSetByIdentityId(int identity_id, String area_name) {
-        String sql = "select t1.* from t_dp_dataset as t1 where t1.owner_id=?  and t1.b_use=1 order by t1.dataease_id";
+        String sql = "select t1.* from t_dp_dataset as t1 where t1.owner_id=?  and t1.b_use=1 order by t1.dataset_group_id";
         List<Record> list = Db.find(sql, identity_id);
         if (!StrKit.isBlank(area_name)) {
             for (Record record : list) {
@@ -155,10 +155,10 @@ public class DataEaseModel {
         Record dataVisualizationInfo = L1.getFirst();
         long bigScreenId = dataVisualizationInfo.getLong("id");
         //这个名称确实是存在，但它是不是我想要的这个云南省项目中的大屏呢
-        Set<Long> set = getFamilyNodes();
+//        Set<Long> set = getFamilyNodes();
-        if (!set.contains(bigScreenId)) {
+//        if (!set.contains(bigScreenId)) {
-            return -2;
+//            return -2;
-        }
+//        }
 
         // 配置的内容
         List<Record> list = getMap(bigScreenId);
@@ -169,13 +169,13 @@ public class DataEaseModel {
             //获取城市编码
             String area_code = getCityCode(cityName);
             //修改前
-            //System.out.println("修改前=" + jo.getJSONObject("map"));
+            System.out.println("修改前=" + jo.getJSONObject("map"));
 
             //修改城市编码
             jo.getJSONObject("map").put("id", area_code);
             jo.getJSONObject("map").put("level", "city");
 
-            //System.out.println("修改后=" + jo.getJSONObject("map"));
+            System.out.println("修改后=" + jo.getJSONObject("map"));
             //写到数据库
             String jsonString = jo.toString();
             Db.use(DB_NAME).update("update core_chart_view set custom_attr=? where id=?", jsonString, id);
@@ -214,7 +214,12 @@ public class DataEaseModel {
      * @param table_name   表名
      * @param dataset_name 数据集名
      */
-    public void collectDataSet(String parent_name, String table_name, String dataset_name, long dataease_id) {
+    public void collectDataSet(String parent_name, String table_name, String dataset_name, long dataset_group_id) {
+        String sql = "select count(1) from t_dp_dataset where dataset_group_id=?";
+        if (Db.queryInt(sql, dataset_group_id) > 0) {
+            System.out.println("数据集已经存在，无需再次添加");
+            return;
+        }
         Record record = new Record();
         record.set("parent_name", parent_name.replace("-", ""));
         record.set("table_name", table_name);
@@ -226,7 +231,7 @@ public class DataEaseModel {
         } else if (parent_name.contains("县")) {
             record.set("owner_id", 3);
         }
-        record.set("dataease_id", dataease_id);
+        record.set("dataset_group_id", dataset_group_id);
         Db.save("t_dp_dataset", "id", record);
         System.out.println("添加数据集成功,parent_name=" + parent_name + ",table_name=" + table_name + ",dataset_name=" + dataset_name);
     }
@@ -330,15 +335,17 @@ public class DataEaseModel {
     /**
      * 将数据集添加到数据库中
      */
-    public void collectDataSet() {
+    public void collectDataSet(boolean clear) {
         //1、获取树根
         SqlPara sqlPara = Db.getSqlPara("DataEase.getTreeRoot");
         Record rRoot = Db.findFirst(sqlPara);
         long rootId = rRoot.getLong("id");
 
-        //清空数据集表
+        if (clear) {
-        String sql = "truncate table t_dp_dataset";
+            //清空数据集表
-        Db.update(sql);
+            String sql = "truncate table t_dp_dataset";
+            Db.update(sql);
+        }
 
         //2、查询有哪些数据集
         Kv kv = Kv.by("id", rootId);
@@ -347,15 +354,15 @@ public class DataEaseModel {
         List<Record> list = Db.find(sqlPara);
 
         for (Record record : list) {
-            long dataease_id = record.getLong("id");
+            long dataset_group_id = record.getLong("id");
             //数据集父名称
             String parent_name = record.getStr("parent_name");
             //数据集名称
             String dataset_name = record.getStr("name");
             //对应的表名
-            String table_name = getTableName(String.valueOf(dataease_id));
+            String table_name = getTableName(String.valueOf(dataset_group_id));
             //将这些数据集扫描到表中，然后标识这个数据集由谁来维护
-            collectDataSet(parent_name, table_name, dataset_name, dataease_id);
+            collectDataSet(parent_name, table_name, dataset_name, dataset_group_id);
         }
     }
 
@@ -456,7 +463,7 @@ public class DataEaseModel {
         String excelFileName = UUID.randomUUID().toString().toUpperCase() + ".xlsx";
         String filePath = exportPath + excelFileName;
         //导出
-        ExcelCommonUtil.writeExcel( tableData, filePath, true);
+        ExcelCommonUtil.writeExcel(tableData, filePath, true);
         return filePath;
     }
 

src/main/java/com/dsideal/base/Test/ChangeCity.java

@@ -0,0 +1,21 @@
+package com.dsideal.base.Test;
+
+import com.dsideal.base.BaseApplication;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
+import com.dsideal.base.Plugin.YamlProp;
+import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.jfinal.kit.Prop;
+
+public class ChangeCity {
+    public static DataEaseModel dm = new DataEaseModel();
+
+    public static void main(String[] args) {
+        //加载配置文件
+        String configFile = "application.yaml";
+        BaseApplication.PropKit = new YamlProp(configFile);
+
+        LocalMysqlConnectUtil.Init();
+        //dm.updateCity("云南省教育决策支持系统【市州】", "楚雄州");
+        dm.updateCity("云南省教育决策支持系统【市州】", "昆明市");
+    }
+}

src/main/java/com/dsideal/base/Tools/Step1_DataSetInit.java

@@ -11,7 +11,7 @@ public class Step1_DataSetInit {
     public static void main(String[] args) throws IOException {
         LocalMysqlConnectUtil.Init();
         //1、添加到数据集表中
-        dm.collectDataSet();
+        dm.collectDataSet(false);
         //2、加上主键
         dm.addPrimaryKey();
         //3、将所有非空列去掉不允许为空的限制