huanghai
/
YunNanDsBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
黄海 9 months ago
parent c4fe061b80
commit 585c029248
7 changed files with 140 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
Doc/v1.0/.cache.json
Unescape View File

@ -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":"市级路由","header":[],"method":["GET","POST"],"methodName":"routePage","paramNodes":[{"description":"哪一个仪表盘","jsonBody":false,"name":"type_id","required":false,"type":"int"}],"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"}],"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":"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"}]

47
Doc/v1.0/YunNanDsBase-v1.0-api-docs.json
Unescape View File

@ -20,17 +20,11 @@
"request": {
"method": "GET",
"url": {
"query": [
{
"description": "哪一个仪表盘",
"value": "",
"key": "type_id"
}
],
"query": [],
"raw": "{{domain}}/dataease/routePage"
}
},
"name": "市级路由"
"name": "routePage"
},
{
"request": {
@ -83,6 +77,43 @@
}
},
"name": "上传Excel文件"
},
{
"request": {
"method": "GET",
"url": {
"query": [
{
"description": "数据集id",
"value": "",
"key": "dataset_id"
}
],
"raw": "{{domain}}/dataease/getDataSetContent"
}
},
"name": "获取数据集下的数据表"
},
{
"request": {
"method": "POST",
"url": {
"query": [
{
"description": "数据集id",
"value": "",
"key": "dataset_id"
},
{
"description": "保存的数据",
"value": "",
"key": "data"
}
],
"raw": "{{domain}}/dataease/saveDataSet"
}
},
"name": "保存数据集下的数据表"
}
],
"name": "DataEaseController"

89
Doc/v1.0/com_dsideal_base_DataEase_Controller_DataEaseController.html
Unescape View File

@ -46,7 +46,7 @@
省级路由
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage">
市级路由
routePage
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet">
根据当前登录人员的identity_id,获取此人员可以维护的数据集名称
@ -60,6 +60,12 @@
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel">
上传Excel文件
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent">
获取数据集下的数据表
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet">
保存数据集下的数据表
</a>
</div>
</div>
</div> </div>
@ -102,28 +108,13 @@
</div>
<hr>
<div class="action-item">
<h2 id="routePage"><a href="#">市级路由 </a></h2>
<h2 id="routePage"><a href="#">routePage </a></h2>
<p><strong>请求URL</strong></p>
<p>
<code>/dataease/routePage</code>
<span class="label label-default">GET</span>
<span class="label label-default">POST</span>
</p>
<p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
<table class="table table-bordered">
<tr>
<th>参数名</th>
<th>类型</th>
<th>必须</th>
<th>描述</th>
</tr>
<tr>
<td>type_id</td>
<td>int</td>
<td>否</td>
<td>哪一个仪表盘</td>
</tr>
</table>
<p><strong>返回结果</strong></p>
<pre class="prettyprint lang-json">{}</pre>
</div>
@ -203,6 +194,66 @@
<span class="label label-default">POST</span>
</p>
<p><strong>返回结果</strong></p>
<pre class="prettyprint lang-json">{}</pre>
</div>
<hr>
<div class="action-item">
<h2 id="getDataSetContent"><a href="#">获取数据集下的数据表 </a></h2>
<p><strong>请求URL</strong></p>
<p>
<code>/dataease/getDataSetContent</code>
<span class="label label-default">GET</span>
<span class="label label-default">POST</span>
</p>
<p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
<table class="table table-bordered">
<tr>
<th>参数名</th>
<th>类型</th>
<th>必须</th>
<th>描述</th>
</tr>
<tr>
<td>dataset_id</td>
<td>int</td>
<td>否</td>
<td>数据集id</td>
</tr>
</table>
<p><strong>返回结果</strong></p>
<pre class="prettyprint lang-json">{}</pre>
</div>
<hr>
<div class="action-item">
<h2 id="saveDataSet"><a href="#">保存数据集下的数据表 </a></h2>
<p><strong>请求URL</strong></p>
<p>
<code>/dataease/saveDataSet</code>
<span class="label label-default">GET</span>
<span class="label label-default">POST</span>
</p>
<p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
<table class="table table-bordered">
<tr>
<th>参数名</th>
<th>类型</th>
<th>必须</th>
<th>描述</th>
</tr>
<tr>
<td>dataset_id</td>
<td>int</td>
<td>否</td>
<td>数据集id</td>
</tr>
<tr>
<td>data</td>
<td>string</td>
<td>否</td>
<td>保存的数据</td>
</tr>
</table>
<p><strong>返回结果</strong></p>
<pre class="prettyprint lang-json">{}</pre>
</div>
<hr>
@ -220,11 +271,13 @@
var search_source_data = [
{name: 'DataEaseController.省级路由', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#route'},
{name: 'DataEaseController.市级路由', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage'},
{name: 'DataEaseController.routePage', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage'},
{name: 'DataEaseController.根据当前登录人员的identity_id,获取此人员可以维护的数据集名称', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet'},
{name: 'DataEaseController.下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel'},
{name: 'DataEaseController.下载模板Excel', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel'},
{name: 'DataEaseController.上传Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel'},
{name: 'DataEaseController.获取数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent'},
{name: 'DataEaseController.保存数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet'},
];

12
Doc/v1.0/index.html
Unescape View File

@ -46,7 +46,7 @@
省级路由
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage">
市级路由
routePage
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet">
根据当前登录人员的identity_id,获取此人员可以维护的数据集名称
@ -60,6 +60,12 @@
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel">
上传Excel文件
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent">
获取数据集下的数据表
</a>
<a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet">
保存数据集下的数据表
</a>
</div>
</div>
</div> </div>
@ -93,11 +99,13 @@
var search_source_data = [
{name: 'DataEaseController.省级路由', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#route'},
{name: 'DataEaseController.市级路由', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage'},
{name: 'DataEaseController.routePage', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage'},
{name: 'DataEaseController.根据当前登录人员的identity_id,获取此人员可以维护的数据集名称', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet'},
{name: 'DataEaseController.下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel'},
{name: 'DataEaseController.下载模板Excel', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel'},
{name: 'DataEaseController.上传Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel'},
{name: 'DataEaseController.获取数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent'},
{name: 'DataEaseController.保存数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet'},
];

4
src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
Unescape View File

@ -264,8 +264,8 @@ public class DataEaseController extends Controller {
@Before(GET.class)
@IsLoginInterface({})
@IsNumericInterface({"dataset_id"})
public void getDataSet(int dataset_id) {
List<Record> list = dm.getDataSet(dataset_id);
public void getDataSetContent(int dataset_id) {
List<Record> list = dm.getDataSetContent(dataset_id);
renderJson(CommonUtil.renderJsonForLayUI(list));
}

2
src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
Unescape View File

@ -568,7 +568,7 @@ public class DataEaseModel {
* @param dataset_id 数据集id
* @return
*/
public List<Record> getDataSet(int dataset_id) {
public List<Record> getDataSetContent(int dataset_id) {
String tableName = getTableName(dataset_id);
String sql = "select * from `" + tableName + "`";
return Db.use(DB_NAME).find(sql);

23
src/main/java/com/dsideal/base/DataEase/Model/ExcelReader.java
Unescape View File

@ -36,12 +36,21 @@ public class ExcelReader {
}
private String getCellValue(Cell cell) {
return switch (cell.getCellType()) {
case STRING -> cell.getStringCellValue();
case NUMERIC -> String.valueOf(cell.getNumericCellValue());
case BOOLEAN -> String.valueOf(cell.getBooleanCellValue());
case FORMULA -> cell.getCellFormula();
default -> "";
};
String res = "";
switch (cell.getCellType()) {
case STRING:
res = cell.getStringCellValue();
break;
case NUMERIC:
res = String.valueOf(cell.getNumericCellValue());
break;
case BOOLEAN:
res = String.valueOf(cell.getBooleanCellValue());
break;
case FORMULA:
res = cell.getCellFormula();
break;
}
return res;
}
}
Write Preview
Loading…
Cancel
Save