'commit'

src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java

@@ -147,7 +147,7 @@ public class DataEaseController extends Controller {
         String dataSetName = record.getStr("dataset_name");
         //导出excel
         String upPath = BaseApplication.PropKit.get("upload.path") + "/";
-        String excelFileName = dm.exportExcel(identity_id, tableName, dataSetName, upPath, area_name);
+        String excelFileName = dm.exportExcel(identity_id, tableName,  upPath, area_name);
         //renderFile
         renderFile(new File(excelFileName), "【" + area_name + "】" + dataSetName + "." + "xlsx");
     }
@@ -179,7 +179,7 @@ public class DataEaseController extends Controller {
         String tableName = record.getStr("table_name");
         String dataSetName = record.getStr("dataset_name");
         //导出excel
-        String excelFileName = dm.exportExcel(identity_id, tableName, dataSetName, tempDir, area_name);
+        String excelFileName = dm.exportExcel(identity_id, tableName,  tempDir, area_name);
         //renderFile
         renderFile(new File(excelFileName), "【样例:" + area_name + "】" + dataSetName + "." + "xlsx");
     }

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

@@ -166,25 +166,20 @@ public class DataEaseModel {
      * @param dataset_name 数据集名
      */
     public void collectDataSet(String parent_name, String table_name, String dataset_name, long dataease_id) {
-        String sql = "select count(1) from t_dp_dataset where table_name=?";
-        if (Db.queryInt(sql, table_name) == 0) {
-            Record record = new Record();
-            record.set("parent_name", parent_name.replace("-", ""));
-            record.set("table_name", table_name);
-            record.set("dataset_name", dataset_name);
-            if (parent_name.contains("省")) {
-                record.set("owner_id", 1);
-            } else if (parent_name.contains("市") || parent_name.contains("州")) {
-                record.set("owner_id", 2);
-            } else if (parent_name.contains("县")) {
-                record.set("owner_id", 3);
-            }
-            record.set("dataease_id", dataease_id);
-            Db.save("t_dp_dataset", "id", record);
-            System.out.println("添加数据集成功,parent_name=" + parent_name + ",table_name=" + table_name + ",dataset_name=" + dataset_name);
-        } else {
-            System.out.println("数据集已存在，跳过添加");
+        Record record = new Record();
+        record.set("parent_name", parent_name.replace("-", ""));
+        record.set("table_name", table_name);
+        record.set("dataset_name", dataset_name);
+        if (parent_name.contains("省")) {
+            record.set("owner_id", 1);
+        } else if (parent_name.contains("市") || parent_name.contains("州")) {
+            record.set("owner_id", 2);
+        } else if (parent_name.contains("县")) {
+            record.set("owner_id", 3);
         }
+        record.set("dataease_id", dataease_id);
+        Db.save("t_dp_dataset", "id", record);
+        System.out.println("添加数据集成功,parent_name=" + parent_name + ",table_name=" + table_name + ",dataset_name=" + dataset_name);
     }
 
     /**
@@ -290,6 +285,10 @@ public class DataEaseModel {
         Record rRoot = Db.findFirst(sqlPara);
         long rootId = rRoot.getLong("id");
 
+        //清空数据集表
+        String sql = "truncate table t_dp_dataset";
+        Db.update(sql);
+
         //2、查询有哪些数据集
         Kv kv = Kv.by("id", rootId);
         kv.set("dataset", true);
@@ -358,12 +357,20 @@ public class DataEaseModel {
      *
      * @param identity_id
      * @param tableName
-     * @param dataSetName
      * @param exportPath
      * @param area_name
      * @throws IOException
      */
-    public String exportExcel(int identity_id, String tableName, String dataSetName, String exportPath, String area_name) throws IOException {
+    public String exportExcel(int identity_id, String tableName, String exportPath, String area_name) throws IOException {
+        //补全默认行政区划
+        if (identity_id == 2) {
+            String sql = "update `" + tableName + "` set `行政区划`='昆明市' where `行政区划` is null";
+            Db.use(DB_NAME).update(sql);
+        }
+        if (identity_id == 3) {
+            String sql = "update `" + tableName + "` set `行政区划`='寻甸县' where `行政区划` is null";
+            Db.use(DB_NAME).update(sql);
+        }
         //对此表中的数据进行直接导出EXCEL
         String sql = "select * from `" + tableName + "`";
         if (identity_id > 1) {

src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java

@@ -32,7 +32,7 @@ public class ExportExcel {
             String tableName = record.getStr("table_name");
             String dataSetName = record.getStr("dataset_name");
             System.out.println("正在处理数据集：" + dataSetName);
-            dm.exportExcel(1, tableName, dataSetName, exportPath, privinceName);
+            dm.exportExcel(1, tableName, exportPath, privinceName);
         }
         //二、导出市的数据集
         System.out.println("正在处理市数据集...");
@@ -41,12 +41,12 @@ public class ExportExcel {
         System.out.println("数据集个数=" + list.size());
         for (Record record : list) {
             String tableName = record.getStr("table_name");
-            String dataSetName = record.getStr("dataset_name").replace("\\","").replace("/","");
+            String dataSetName = record.getStr("dataset_name").replace("\\", "").replace("/", "");
             System.out.println("正在处理数据集：" + dataSetName);
 
             Record cityRecord = dm.getAreaByName(city_name);
             String cityName = cityRecord.getStr("area_name");
-            dm.exportExcel(2, tableName, dataSetName, exportPath, cityName);
+            dm.exportExcel(2, tableName, exportPath, cityName);
         }
         //三、导出县区的数据集
         System.out.println("正在处理县区数据集...");
@@ -55,12 +55,12 @@ public class ExportExcel {
         System.out.println("数据集个数=" + list.size());
         for (Record record : list) {
             String tableName = record.getStr("table_name");
-            String dataSetName = record.getStr("dataset_name").replace("\\","").replace("/","");
+            String dataSetName = record.getStr("dataset_name").replace("\\", "").replace("/", "");
             System.out.println("正在处理数据集：" + dataSetName);
 
             Record areaRecord = dm.getAreaByName(area_name);
             String areaName = areaRecord.getStr("area_name");
-            dm.exportExcel(3, tableName, dataSetName, exportPath, areaName);
+            dm.exportExcel(3, tableName, exportPath, areaName);
         }
         System.out.println("导出完成！");
     }