git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@618 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/FileController.java

@@ -0,0 +1,57 @@
+package com.uas.platform.b2b.controller;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.service.AttachService;
+
+/**
+ * 平台文件
+ * 
+ * @author yingp
+ *
+ */
+@RestController
+@RequestMapping("/file")
+public class FileController {
+
+	@Autowired
+	private AttachService attachService;
+
+	/**
+	 * 文件下载
+	 * 
+	 * @param fileId
+	 * @param response
+	 * @throws IOException
+	 */
+	@RequestMapping("/{fileId}")
+	public void download(@PathVariable("fileId") long fileId, HttpServletResponse response) throws IOException {
+		Attach attch = attachService.getAttach(fileId);
+		File file = new File(attch.getPath());
+		InputStream in = new FileInputStream(file);
+		OutputStream os = response.getOutputStream();
+		response.addHeader("Content-Disposition", "attachment;filename=" + new String(attch.getName().getBytes("utf-8"), "iso-8859-1"));
+		response.addHeader("Content-Length", String.valueOf(file.length()));
+		response.setCharacterEncoding("utf-8");
+		response.setContentType("application/octec-stream");
+		int data = 0;
+		while ((data = in.read()) != -1) {
+			os.write(data);
+		}
+		in.close();
+		os.close();
+	}
+
+}

src/main/java/com/uas/platform/b2b/erp/controller/InquiryController.java

@@ -103,7 +103,6 @@ public class InquiryController {
 	@ResponseBody
 	public void uploadAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
-		System.out.println("接收附件：" + jsonStr);
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "inquiry", "客户采购询价单附件", fileList);
 		purchaseInquiryService.saveAttach(attachs);

src/main/java/com/uas/platform/b2b/erp/model/SaleDown.java

@@ -17,11 +17,11 @@ public class SaleDown {
 	private long b2b_pu_id;
 	private String sa_code;
 	private String sa_pocode;
-	private long sa_customeruu;// 客户UU
+	private Long sa_customeruu;// 客户UU
 	private String sa_custcontact;// 客户联系人
 	private Long sa_custcontactuu;// 客户联系人UU
 	private String sa_custmobile;// 客户联系人手机号
-	private long sa_useruu;// 企业业务员UU
+	private Long sa_useruu;// 企业业务员UU
 	private Date sa_date;
 	private Date sa_recorddate;
 	private String sa_payments;
@@ -54,11 +54,11 @@ public class SaleDown {
 		this.sa_pocode = sa_pocode;
 	}
 
-	public long getSa_customeruu() {
+	public Long getSa_customeruu() {
 		return sa_customeruu;
 	}
 
-	public void setSa_customeruu(long sa_customeruu) {
+	public void setSa_customeruu(Long sa_customeruu) {
 		this.sa_customeruu = sa_customeruu;
 	}
 
@@ -118,11 +118,11 @@ public class SaleDown {
 		this.saleDownDetails = saleDownDetails;
 	}
 
-	public long getSa_useruu() {
+	public Long getSa_useruu() {
 		return sa_useruu;
 	}
 
-	public void setSa_useruu(long sa_useruu) {
+	public void setSa_useruu(Long sa_useruu) {
 		this.sa_useruu = sa_useruu;
 	}
 

src/main/java/com/uas/platform/b2b/service/impl/AttachServiceImpl.java

@@ -91,7 +91,7 @@ public class AttachServiceImpl implements AttachService {
 						Map<String, Object> params = entryParams.get(entry);
 						Attach attach = new Attach(String.valueOf(params.get("name")), fileMap.get(entry), description, file.length());
 						attach = attachDao.save(attach);
-						attach.setSourceId(Long.parseLong(entryParams.get("sourceId").toString()));
+						attach.setSourceId(Long.parseLong(params.get("sourceId").toString()));
 						attachs.add(attach);
 					}
 				}
@@ -114,7 +114,11 @@ public class AttachServiceImpl implements AttachService {
 				return fileMap;
 			}
 		} catch (IOException e) {
-
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		} catch (Error e) {
+			e.printStackTrace();
 		}
 		return null;
 	}
@@ -135,7 +139,7 @@ public class AttachServiceImpl implements AttachService {
 		if (!dir.isDirectory())
 			dir.mkdir();
 		if (SystemSession.getUser() != null) {
-			path += File.separator + SystemSession.getUser().getEnterprise();
+			path += File.separator + SystemSession.getUser().getEnterprise().getUu();
 			dir = new File(path);
 			if (!dir.isDirectory())
 				dir.mkdir();

src/main/resources/spring/security.xml

@@ -13,6 +13,7 @@
 	<!-- 登录页面不过滤 -->
 	<http pattern="/signin/**" security="none" />
 	<http pattern="/signup/**" security="none" />
+	<http pattern="/file/**" security="none" />
 	<http pattern="/snapshot/notice/**" security="none" />
 
 	<http auto-config="true" use-expressions="true">