From eb9bfb194e6d434bfafb6a0480b00edd6a23d12d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 30 Dec 2024 07:09:22 +0800 Subject: [PATCH] 'commit' --- Doc/云南教育厅修改.txt | 9 ----- Doc/账号/云南教育厅修改.txt | 19 +++++++++++ Doc/账号/县区管理员账号.xls | Bin 0 -> 21504 bytes Doc/账号/市管理员账号.xls | Bin 0 -> 6144 bytes WebRoot/html/pages/dataease/dataList.html | 2 -- .../Controller/DataEaseController.java | 31 ------------------ 6 files changed, 19 insertions(+), 42 deletions(-) delete mode 100644 Doc/云南教育厅修改.txt create mode 100644 Doc/账号/云南教育厅修改.txt create mode 100644 Doc/账号/县区管理员账号.xls create mode 100644 Doc/账号/市管理员账号.xls diff --git a/Doc/云南教育厅修改.txt b/Doc/云南教育厅修改.txt deleted file mode 100644 index bab7289c..00000000 --- a/Doc/云南教育厅修改.txt +++ /dev/null @@ -1,9 +0,0 @@ -#省管理员 -sys1 -12345678 - -大屏数据维护 -大屏数据省代录市数据 -大屏数据省代录区数据 - - diff --git a/Doc/账号/云南教育厅修改.txt b/Doc/账号/云南教育厅修改.txt new file mode 100644 index 00000000..ad8f2ca6 --- /dev/null +++ b/Doc/账号/云南教育厅修改.txt @@ -0,0 +1,19 @@ +#省管理员 +sys1 +12345678 + +大屏数据维护 +大屏数据省代录市数据 +大屏数据省代录区数据 + +#市州管理员 +shi1 +200187 +大屏数据维护 +大屏数据市级代录 + + +#县区管理员 +qu1 +358526 +大屏数据维护 diff --git a/Doc/账号/县区管理员账号.xls b/Doc/账号/县区管理员账号.xls new file mode 100644 index 0000000000000000000000000000000000000000..6a935350ff2d51653fd22dc56730bc0179ed6514 GIT binary patch literal 21504 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 literal 0 HcmV?d00001 diff --git a/WebRoot/html/pages/dataease/dataList.html b/WebRoot/html/pages/dataease/dataList.html index ecdd9ab1..0d3a78de 100644 --- a/WebRoot/html/pages/dataease/dataList.html +++ b/WebRoot/html/pages/dataease/dataList.html @@ -53,8 +53,6 @@ 上传数据 - 下载样例模板 下载数据 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 819f07d6..d8ac127a 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -215,37 +215,6 @@ public class DataEaseController extends Controller { } - /** - * 下载模板Excel - * - * @param id 数据集id - */ - @Before(GET.class) - @IsLoginInterface({}) - @IsNumericInterface({"id"}) - public void downSampleExcel(int id) throws IOException { - String identity_idStr = CookieUtil.getValue(getRequest(), "identity_id"); - int identity_id = 1; - if (!StrKit.isBlank(identity_idStr)) { - identity_id = Integer.parseInt(identity_idStr); - } - String area_name = "云南省"; - //获取他是哪个城市的管理员 - if (identity_id == 2) { - area_name = "昆明市"; - } - //获取他是哪个县区的管理员 - if (identity_id == 3) { - area_name = "寻甸县"; - } - Record record = dm.getDataSetById(id); - String tableName = record.getStr("table_name"); - String dataSetName = record.getStr("dataset_name"); - //导出excel - String excelFileName = dm.exportExcel(identity_id, tableName, tempDir, area_name); - //renderFile - renderFile(new File(excelFileName), "【样例:" + area_name + "】" + dataSetName + "." + "xlsx"); - } /** * 下载指定数据集的Excel文件