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

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

@@ -58,7 +58,7 @@ public class EnterpriseController {
 		System.out.println("enName--" + enterprise);
 		System.out.println("fileName--" + uploadItem.getFile().getOriginalFilename());
 		Enterprise newEnterprise = FlexJsonUtils.fromJson(enterprise, Enterprise.class);//需要把字符串转成Object
-		Attach attach = attachService.uploadAttach(uploadItem);//先保存上传到文件
+		Attach attach = attachService.upload(uploadItem, "bussinessCodeImg", "客户营业执照复印件或照片");//先保存上传到文件
 		if(attach == null){//文件过大
 			map.put("error", "文件过大");
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.FORBIDDEN);

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

@@ -57,7 +57,7 @@ public class RegisterController {
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
 		Enterprise newEnterprise = FlexJsonUtils.fromJson(enterprise, Enterprise.class);//需要把字符串转成Object
-		Attach attach = attachService.uploadAttach(uploadItem);//先保存上传到文件
+		Attach attach = attachService.upload(uploadItem, "bussinessCodeImg", "客户营业执照复印件或照片");//先保存上传到文件
 		if(attach == null){//文件过大
 			map.put("error", "文件过大");
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.FORBIDDEN);

src/main/java/com/uas/platform/b2b/dao/AttachDao.java

@@ -8,11 +8,4 @@ import com.uas.platform.b2b.model.Attach;
 @Repository
 public interface AttachDao extends JpaRepository<Attach, Long> {
 	
-	/**
-	 * 根据文件ID获取实体类
-	 * @param atId
-	 * @return
-	 */
-	public Attach findAttachByAtId(Long atId);
-
 }

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

@@ -15,6 +15,8 @@ import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.erp.service.InquiryService;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
@@ -35,6 +37,9 @@ public class InquiryController {
 	@Autowired
 	private PurchaseInquiryService purchaseInquiryService;
 
+	@Autowired
+	private AttachService attachService;
+
 	/**
 	 * 将买家ERP的采购询价写到平台
 	 * 
@@ -87,4 +92,15 @@ public class InquiryController {
 		purchaseInquiryService.onReplyDecide(inquiryService.convertInquiryDecide(decides));
 	}
 
+	/**
+	 * 买家ERP的附件
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/attach", method = RequestMethod.POST)
+	@ResponseBody
+	public void uploadAttach(FileUpload uploadItem) throws UnsupportedEncodingException {
+		attachService.uploadAndSave(uploadItem, "inquiry", "客户采购询价单附件");
+	}
+
 }

src/main/java/com/uas/platform/b2b/model/Attach.java

@@ -9,66 +9,94 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
-@Table(name="attachs")
+@Table(name = "attachs")
 public class Attach {
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "attachs_gen")
 	@SequenceGenerator(name = "attachs_gen", sequenceName = "attachs_seq", allocationSize = 1)
 	@Column(name = "at_id")
-	private Long atId;
+	private Long id;
 	/**
 	 * 路径
 	 */
 	@Column(name = "at_path")
-	private String atPath;
+	private String path;
 	/**
 	 * 描述语
 	 */
 	@Column(name = "at_description")
-	private String atDescription;
+	private String description;
 	/**
-	 * 文件类型
+	 * 文件名称
 	 */
-	@Column(name="at_type")
-	private String atType;
+	@Column(name = "at_name")
+	private String name;
+
 	/**
-	 * 文件名称
+	 * 文件大小
 	 */
-	@Column(name="at_name")
-	private String atName;
-	
-	public Long getAtId() {
-		return atId;
+	@Column(name = "at_size")
+	private Long size;
+
+	public Long getId() {
+		return id;
 	}
-	public void setAtId(Long atId) {
-		this.atId = atId;
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
 	}
-	public String getAtPath() {
-		return atPath;
+
+	public String getDescription() {
+		return description;
 	}
-	public void setAtPath(String atPath) {
-		this.atPath = atPath;
+
+	public void setDescription(String description) {
+		this.description = description;
 	}
-	public String getAtDescription() {
-		return atDescription;
+
+	public String getName() {
+		return name;
 	}
-	public void setAtDescription(String atDescription) {
-		this.atDescription = atDescription;
+
+	public void setName(String name) {
+		this.name = name;
 	}
-	public String getAtType() {
-		return atType;
+
+	public Long getSize() {
+		return size;
 	}
-	public void setAtType(String atType) {
-		this.atType = atType;
+
+	public void setSize(Long size) {
+		this.size = size;
 	}
-	public String getAtName() {
-		return atName;
+
+	public Attach() {
 	}
-	public void setAtName(String atName) {
-		this.atName = atName;
+
+	/**
+	 * @param fileName
+	 *            文件名
+	 * @param filePath
+	 *            文件物理路径
+	 * @param description
+	 *            描述
+	 * @param size
+	 *            大小
+	 */
+	public Attach(String fileName, String filePath, String description, long size) {
+		this.name = fileName;
+		this.path = filePath;
+		this.description = description;
+		this.size = size;
 	}
-	
-	
 
 }

src/main/java/com/uas/platform/b2b/service/AttachService.java

@@ -3,40 +3,43 @@ package com.uas.platform.b2b.service;
 import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.FileUpload;
 
-
 public interface AttachService {
 
 	/**
 	 * 根据文件ID获取附件
+	 * 
 	 * @param id
 	 * @return
 	 */
-	public Attach getAttachById(Long id);
-	
+	public Attach getAttach(Long id);
+
 	/**
 	 * 保存一个文件路径
+	 * 
 	 * @param attach
 	 * @return
 	 */
-	public Attach saveAttachPath(Attach attach);
+	public Attach save(Attach attach);
+
 	/**
-	 * 上传附件到数据库
 	 * @param uploadItem
+	 * @param parentDir
+	 *            文件的父级目录
+	 * @param description
+	 *            描述
 	 * @return
 	 */
-	public Attach uploadAndSaveAttach(FileUpload uploadItem);
+	public Attach uploadAndSave(FileUpload uploadItem, String parentDir, String description);
+
 	/**
-	 * 上传附件到数据库
+	 * 上传文件
+	 * 
 	 * @param uploadItem
+	 * @param parentDir
+	 *            文件的父级目录
+	 * @param description
+	 *            描述
 	 * @return
 	 */
-	public Attach uploadAttach(FileUpload uploadItem);
-	/**
-	 * 生成文件的完整路径
-	 * @param fileName 文件名称
-	 * @param dirName 第一级目录
-	 * @param userName 第二级目录
-	 * @return
-	 */
-	public String getFilePath(String fileName, String dirName, String userName);
+	public Attach upload(FileUpload uploadItem, String parentDir, String description);
 }

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

@@ -15,63 +15,35 @@ import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.service.AttachService;
 
-
 @Service
-public class AttachServiceImpl implements AttachService{
+public class AttachServiceImpl implements AttachService {
 
 	@Autowired
 	private AttachDao attachDao;
-	
+
 	@Override
-	public Attach getAttachById(Long id) {
-		return attachDao.findAttachByAtId(id);
+	public Attach getAttach(Long id) {
+		return attachDao.findOne(id);
 	}
 
 	@Override
-	public Attach saveAttachPath(Attach attach) {
+	public Attach save(Attach attach) {
 		return attachDao.save(attach);
 	}
 
 	@Override
-	public Attach uploadAndSaveAttach(FileUpload uploadItem) {
-		String filename = uploadItem.getFile().getOriginalFilename();
-		long size = uploadItem.getFile().getSize();
-		if (size > 104857600) {
-			return null;//文件过大，上传失败
-		}
-		String path = getFilePath(filename, "postattach", "bussinessCodeImg");
-		File file = new File(path);
-		BufferedOutputStream bos = null;
-		BufferedInputStream bis = null;
-		try {
-			bos = new BufferedOutputStream(new FileOutputStream(file));
-			bis = new BufferedInputStream(uploadItem.getFile().getInputStream());
-			int c;
-			while ((c = bis.read()) != -1) {
-				bos.write(c);
-				bos.flush();
-			}
-			bis.close();
-			bos.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		Attach attach = new Attach();
-		attach.setAtPath(path);
-		attach.setAtDescription("客户营业执照复印件或照片");
-		attach.setAtName(filename);
-		Attach at = saveAttachPath(attach);
-		return at;
+	public Attach uploadAndSave(FileUpload uploadItem, String parentDir, String description) {
+		return save(upload(uploadItem, parentDir, description));
 	}
-	
+
 	@Override
-	public Attach uploadAttach(FileUpload uploadItem) {
+	public Attach upload(FileUpload uploadItem, String parentDir, String description) {
 		String filename = uploadItem.getFile().getOriginalFilename();
 		long size = uploadItem.getFile().getSize();
 		if (size > 104857600) {
-			return null;//文件过大，上传失败
+			return null;// 文件过大，上传失败
 		}
-		String path = getFilePath(filename, "postattach", "bussinessCodeImg");
+		String path = getFilePath(filename, parentDir);
 		File file = new File(path);
 		BufferedOutputStream bos = null;
 		BufferedInputStream bis = null;
@@ -88,26 +60,20 @@ public class AttachServiceImpl implements AttachService{
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		Attach attach = new Attach();
-		attach.setAtPath(path);
-		attach.setAtDescription("客户营业执照复印件或照片");
-		attach.setAtName(filename);
-		return attach;
-	};
+		return new Attach(filename, path, description, size);
+	}
 
-	@Override
-	public String getFilePath(String fileName, String dirName, String userName) {
+	private String getFilePath(String fileName, String parentDir) {
 		String uuid = UUID.randomUUID().toString().replaceAll("\\-", "");
-		String suffix = fileName.indexOf(".") != -1 ? fileName.substring(fileName.lastIndexOf("."), fileName.length())
-				: "";
-		String path = BaseUtil.FILEPATH + dirName;
+		String suffix = fileName.indexOf(".") != -1 ? fileName.substring(fileName.lastIndexOf("."), fileName.length()) : "";
+		String path = BaseUtil.FILEPATH + "postattach";
 		File file = new File(path);
 		if (!file.isDirectory()) {
 			file.mkdir();
-			path = path + File.separator + userName;
+			path = path + File.separator + parentDir;
 			new File(path).mkdir();
 		} else {
-			path = path + File.separator + userName;
+			path = path + File.separator + parentDir;
 			file = new File(path);
 			if (!file.isDirectory()) {
 				file.mkdir();

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

@@ -68,7 +68,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 			//添加要传输的数据
 			newEnterprise.setEnAdminEmail(enterprise.getEnAdminEmail());
 			newEnterprise.setEnAdminTel(enterprise.getEnAdminTel());
-			newEnterprise.setEnBussinesscodeImg(newEnterprise.getEnBussinessCodeAttach().getAtId());
+			newEnterprise.setEnBussinesscodeImg(newEnterprise.getEnBussinessCodeAttach().getId());
 			sendToAduit(newEnterprise);//传给管理平台进行资料审核
 			return newEnterprise;
 		}

src/main/resources/spring/context.xml

@@ -84,7 +84,7 @@
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 				<property name="generateDdl" value="false" />
 				<property name="databasePlatform" value="org.hibernate.dialect.Oracle10gDialect" />
-				<property name="showSql" value="true" />
+				<property name="showSql" value="false" />
 			</bean>
 		</property>
 		<property name="jpaDialect">