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

Doc/v1.0/.cache.json

@@ -1 +1 @@
-[{"baseUrl":"","className":"DataEaseController","description":"DataEaseController","docFileName":"com_dsideal_base_DataEase_Controller_DataEaseController.html","generateDocs":true,"packageName":"com.dsideal.base.DataEase.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#route","deprecated":false,"description":"省级路由","header":[],"method":["GET","POST"],"methodName":"route","paramNodes":[{"description":"城市名称","jsonBody":false,"name":"city_name","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/route"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage","deprecated":false,"description":"routePage","header":[],"method":["GET","POST"],"methodName":"routePage","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/routePage"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet","deprecated":false,"description":"根据当前登录人员的identity_id,获取此人员可以维护的数据集名称","header":[],"method":["GET","POST"],"methodName":"getDataSet","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSet"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel","deprecated":false,"description":"下载指定数据集的Excel文件","header":[],"method":["GET","POST"],"methodName":"downloadExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downloadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel","deprecated":false,"description":"下载模板Excel","header":[],"method":["GET","POST"],"methodName":"downSampleExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downSampleExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel","deprecated":false,"description":"上传Excel文件","header":[],"method":["GET","POST"],"methodName":"uploadExcel","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/uploadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent","deprecated":false,"description":"获取数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"getDataSetContent","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"dataset_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetContent"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet","deprecated":false,"description":"保存数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"saveDataSet","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"dataset_id","required":false,"type":"int"},{"description":"保存的数据","jsonBody":false,"name":"data","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/saveDataSet"}],"srcFileName":"D:\\dsWork\\YunNanDsBase\\src\\main\\java\\com\\dsideal\\base\\DataEase\\Controller\\DataEaseController.java"}]
+[{"baseUrl":"","className":"DataEaseController","description":"DataEaseController","docFileName":"com_dsideal_base_DataEase_Controller_DataEaseController.html","generateDocs":true,"packageName":"com.dsideal.base.DataEase.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#route","deprecated":false,"description":"省级路由","header":[],"method":["GET","POST"],"methodName":"route","paramNodes":[{"description":"城市名称","jsonBody":false,"name":"city_name","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/route"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage","deprecated":false,"description":"routePage","header":[],"method":["GET","POST"],"methodName":"routePage","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/routePage"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet","deprecated":false,"description":"根据当前登录人员的identity_id,获取此人员可以维护的数据集名称","header":[],"method":["GET","POST"],"methodName":"getDataSet","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSet"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel","deprecated":false,"description":"下载指定数据集的Excel文件","header":[],"method":["GET","POST"],"methodName":"downloadExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downloadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel","deprecated":false,"description":"下载模板Excel","header":[],"method":["GET","POST"],"methodName":"downSampleExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downSampleExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel","deprecated":false,"description":"上传Excel文件","header":[],"method":["GET","POST"],"methodName":"uploadExcel","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/uploadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent","deprecated":false,"description":"获取数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"getDataSetContent","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetContent"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet","deprecated":false,"description":"保存数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"saveDataSet","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"},{"description":"保存的数据","jsonBody":false,"name":"data","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/saveDataSet"}],"srcFileName":"D:\\dsWork\\YunNanDsBase\\src\\main\\java\\com\\dsideal\\base\\DataEase\\Controller\\DataEaseController.java"}]

Doc/v1.0/YunNanDsBase-v1.0-api-docs.json

@@ -86,7 +86,7 @@
             {
               "description": "数据集id",
               "value": "",
-              "key": "dataset_id"
+              "key": "id"
             }
           ],
           "raw": "{{domain}}/dataease/getDataSetContent"
@@ -102,7 +102,7 @@
             {
               "description": "数据集id",
               "value": "",
-              "key": "dataset_id"
+              "key": "id"
             },
             {
               "description": "保存的数据",

Doc/v1.0/com_dsideal_base_DataEase_Controller_DataEaseController.html

@@ -214,7 +214,7 @@
                 <th>描述</th>
             </tr>
                     <tr>
-                        <td>dataset_id</td>
+                        <td>id</td>
                         <td>int</td>
                         <td>否</td>
                         <td>数据集id</td>
@@ -241,7 +241,7 @@
                 <th>描述</th>
             </tr>
                     <tr>
-                        <td>dataset_id</td>
+                        <td>id</td>
                         <td>int</td>
                         <td>否</td>
                         <td>数据集id</td>

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

@@ -259,25 +259,25 @@ 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);
+    @IsNumericInterface({ "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 +297,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, "保存成功"));
     }
 }

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;