From 9fb685651f6641e89051dc7c5b56ac8754b4c4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 7 Nov 2024 09:25:11 +0800
Subject: [PATCH 1/2] 'commit'

---
 .../Controller/DataEaseController.java        | 13 +++++------
 .../base/DataEase/Model/DataEaseModel.java    | 23 +++++++++++--------
 2 files changed, 19 insertions(+), 17 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 0f3f72ed..9d079695 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -259,25 +259,24 @@ public class DataEaseController extends Controller {
     /**
      * 获取数据集下的数据表
      *
-     * @param dataset_id 数据集id
+     * @param id 数据集id
      */
     @Before(GET.class)
     @IsLoginInterface({})
-    @IsNumericInterface({"dataset_id"})
-    public void getDataSetContent(int dataset_id) {
-        List<Record> list = dm.getDataSetContent(dataset_id);
+    public void getDataSetContent(int id) {
+        List<Record> list = dm.getDataSetContent(id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
     /**
      * 保存数据集下的数据表
      *
-     * @param dataset_id 数据集id
+     * @param id 数据集id
      * @param data       保存的数据
      */
     @Before(POST.class)
     @IsLoginInterface({})
-    public void saveDataSet(int dataset_id, String data) {
+    public void saveDataSet(int id, String data) {
         //登录的人员
         int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id"));
         String person_id = CookieUtil.getValue(getRequest(), "person_id");
@@ -297,7 +296,7 @@ public class DataEaseController extends Controller {
             jo.put("上级行政区划", parent_area_name);
         }
         //保存
-        dm.saveDataSet(dataset_id, area_name, jsonArray);
+        dm.saveDataSet(id, area_name, jsonArray);
         renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
     }
 }
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 33eeea9b..8f492876 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -190,7 +190,7 @@ public class DataEaseModel {
      * @param dataset_group_id 数据集的id
      * @return 表名
      */
-    public String getTableName(long dataset_group_id) {
+    public String getTableName(String dataset_group_id) {
         Kv kv = Kv.by("dataset_group_id", dataset_group_id);
         SqlPara sqlPara = Db.getSqlPara("DataEase.getTableName", kv);
         return Db.findFirst(sqlPara).getStr("table_name");
@@ -351,7 +351,7 @@ public class DataEaseModel {
             //数据集名称
             String dataset_name = record.getStr("name");
             //对应的表名
-            String table_name = getTableName(dataease_id);
+            String table_name = getTableName(String.valueOf(dataease_id));
             //将这些数据集扫描到表中，然后标识这个数据集由谁来维护
             collectDataSet(parent_name, table_name, dataset_name, dataease_id);
         }
@@ -565,11 +565,12 @@ public class DataEaseModel {
     /**
      * 获取数据集对应的表
      *
-     * @param dataset_id 数据集id
+     * @param id 数据集id
      * @return
      */
-    public List<Record> getDataSetContent(int dataset_id) {
-        String tableName = getTableName(dataset_id);
+    public List<Record> getDataSetContent(int id) {
+        Record record = Db.findById("t_dp_dataset", "id", id);
+        String tableName = record.getStr("table_name");
         String sql = "select * from `" + tableName + "`";
         return Db.use(DB_NAME).find(sql);
     }
@@ -577,20 +578,22 @@ public class DataEaseModel {
     /**
      * 保存数据集对应的表
      *
-     * @param dataset_id 数据集id
+     * @param id 数据集id
      * @param ja         json数组
      */
-    public void saveDataSet( int dataset_id, String area_name, JSONArray ja) {
-        String tableName = getTableName(dataset_id);
+    public void saveDataSet(int id, String area_name, JSONArray ja) {
+        Record record = Db.findById("t_dp_dataset", "id", id);
+        String tableName = record.getStr("table_name");
+
         String sql = "delete from `" + tableName + "` where `行政区划`=?";
-        Db.use(DB_NAME).update(sql,area_name);
+        Db.use(DB_NAME).update(sql, area_name);
 
         List<Record> list = new ArrayList<>();
         for (int i = 0; i < ja.size(); i++) {
             JSONObject jsonObject = ja.getJSONObject(i);
             //遍历jo的每一个属性
             // 或者使用keySet和for-each循环遍历
-            Record record = new Record();
+            record = new Record();
             for (Object key : jsonObject.keySet()) {
                 Object value = jsonObject.get(key);
                 if (value.equals("null")) value = null;

From 37e1523dc3594baeaacca5cbbb3a27cd0705cb22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 7 Nov 2024 09:27:52 +0800
Subject: [PATCH 2/2] 'commit'

---
 .../com/dsideal/base/DataEase/Controller/DataEaseController.java | 1 +
 1 file changed, 1 insertion(+)

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 9d079695..32a4a45f 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -263,6 +263,7 @@ public class DataEaseController extends Controller {
      */
     @Before(GET.class)
     @IsLoginInterface({})
+    @IsNumericInterface({ "id" })
     public void getDataSetContent(int id) {
         List<Record> list = dm.getDataSetContent(id);
         renderJson(CommonUtil.renderJsonForLayUI(list));