'commit'

Doc/云南教育厅修改.txt

@@ -1,9 +0,0 @@
-#省管理员
-sys1
-12345678
-
-大屏数据维护
-大屏数据省代录市数据
-大屏数据省代录区数据
-
-

Doc/账号/云南教育厅修改.txt

@@ -0,0 +1,19 @@
+#省管理员
+sys1
+12345678
+
+大屏数据维护
+大屏数据省代录市数据
+大屏数据省代录区数据
+
+#市州管理员
+shi1
+200187
+大屏数据维护
+大屏数据市级代录
+
+
+#县区管理员
+qu1
+358526
+大屏数据维护

WebRoot/html/pages/dataease/dataList.html

@@ -53,8 +53,6 @@
                 <span class="woo-tool-span woo-tool-text-span" lay-event="uploadData"><a
                     class="woo-theme-color">上传数据</a></span>  
                 <i class="woo-tool-text-delimiter"></i>
-                <span class="woo-tool-span woo-tool-text-span" lay-event="downloadSample"><a
-                    class="woo-theme-color">下载样例模板</a></span>  
                 <i class="woo-tool-text-delimiter"></i>
                 <span class="woo-tool-span woo-tool-text-span" lay-event="downloadData"><a
                     class="woo-theme-color">下载数据</a></span>  

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文件