Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents f695c7ec b61d259d
Showing 3 changed files with 29 additions and 2 deletions
src/main/java/com/bsth/controller/DownloadController.java
src/main/resources/static/pages/electricity/jdl/list.html
src/main/resources/static/pages/electricity/jdl/upload.html
@@ -100,4 +100,29 @@ public class DownloadController
         os.close();
         file.delete();
     }  
+    
+    
+    @RequestMapping("downloadModel")
+    public void downloadModel(HttpServletResponse response,String fileName)
+    		throws IOException {
+//    	String fileNames=URLDecoder.decode(fileName,"UTF-8");
+    	fileName =fileName + ".xls";
+    	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
+    	File file = new File(moudelPath);// path是根据日志路径和文件名拼接出来的
+//        String filename = file.getName();// 获取日志文件名称
+        InputStream fis = new BufferedInputStream(new FileInputStream(moudelPath));
+        byte[] buffer = new byte[fis.available()];
+        fis.read(buffer);
+        fis.close();
+        response.reset();
+        response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.replaceAll(" ", "").getBytes("utf-8"),"iso8859-1"));
+        response.addHeader("Content-Length", "" + file.length());
+        OutputStream os = new BufferedOutputStream(response.getOutputStream());
+        response.setContentType("application/octet-stream");
+        os.write(buffer);// 输出文件
+        os.flush();
+        os.close();
+    }
+    
+    
 }
@@ -117,7 +117,7 @@
         });
         //提交
-        $('tr.filter .filter-submit').on('click', function () {
+        $('tr.filter .filter-submit').on('click', function () {
 			var gsbm = $('#gsbm').val();
 			var fgsbm = $('#fgsbm').val();
             if ($("#rq").val() == "" || $("#rq").val() ==null){
@@ -79,6 +79,8 @@
 	                layer.close(j);
 					alert(data.result);
 // 					alert("文件导入成功");
+					$('#uploadFile').modal('hide');
+					$('tr.filter .filter-submit').click();
 				},
 				error : function(data, status, e) {
 	                layer.close(j);
@@ -88,7 +90,7 @@
 		});
 		$('#downLoad').on('click', function(){
-			window.open("/downloadFile/download?fileName=import_Jdl");
+			window.open("/downloadFile/downloadModel?fileName=import_Jdl");
 		});
 		function getCurrSelNode(){