--no commit message

com.zrqx.file/src/main/java/com/zrqx/file/controller/FileController.java

@@ -52,6 +52,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.file.CreatreQRCodeForm;
+import com.zrqx.core.form.file.QrcodeForm;
 import com.zrqx.core.model.file.FileInfo;
 import com.zrqx.core.util.datatype.UUIDUtil;
 import com.zrqx.core.util.download.DownloadUtil;
@@ -216,11 +217,11 @@ public class FileController {
 	}
 	@ApiOperation(value = "生成二维码zip")
 	@RequestMapping(value = "/download/zip", method = RequestMethod.POST)
-	public String downLoad(HttpServletResponse response,@RequestBody List<String> fileNames) throws Exception {
+	public String downLoad(HttpServletResponse response,@RequestBody QrcodeForm form ) throws Exception {
 		Example example =service.createExample();
-		example.createCriteria().andIn("fileName", fileNames);
+		example.createCriteria().andIn("fileName", form.getFileNames());
 		List<FileInfo> list = service.selectByExample(example);
-		return ZipUtil.zip(rootPath, list);
+		return ZipUtil.zip(rootPath, list,form.getType());
 	}
 	@ApiOperation(value = "导出二维码zip")
 	@RequestMapping(value = "/download/zip", method = RequestMethod.GET)

com.zrqx.file/src/main/java/com/zrqx/file/util/BookUtil.java

@@ -36,13 +36,18 @@ public class BookUtil {
 		String originalFilename = file.getOriginalFilename();
 		System.out.println(file.getContentType());
 		// 源文件的名称,不带后缀
-		String fileName = originalFilename.substring(0, originalFilename.lastIndexOf("."));
+		String fileName = "";
+		if(originalFilename.contains("/")){
+			fileName = originalFilename.substring(originalFilename.lastIndexOf("/")+1, originalFilename.lastIndexOf("."));
+		}else{
+			fileName = originalFilename.substring(0, originalFilename.lastIndexOf("."));		
+		}
 		FileInfo fileInfo = new FileInfo();
 		fileInfo.setOriginalFileName(originalFilename);
-		int count = service.selectCount(fileInfo);
-		if (count > 0) {
+		//int count = service.selectCount(fileInfo);
+/*		if (count > 0) {
 			throw new BaseException("epub已存在");
-		}
+		}*/
 
 		Ebook ebook = new Ebook();
 		Book book = new Book();
@@ -61,22 +66,47 @@ public class BookUtil {
 			
 			ev.setBook(book);
 			ev.setEbook(ebook);
-			/*ev.setBookgoods(bookgoods);
-			ev.setBookissued(bookissued);*/
+			//isbn
+			book.setIsbn(epubUtil.getISBN());
 			ev = er.setBookInfo(epubUtil, ev);
-			
 			/**
 			 * 保存元数据相关内容
 			 */
 			// 名称
-			book.setName(epubUtil.getBookTitle());
+			book.setName(epubUtil.getName());
 			// 作者
 			book.setAuthor(epubUtil.getAuthor());
 			// 出版时间
 			book.setPublishTime(DateUtils.dateTimeToStrYMD(epubUtil.getPublishDate()));
-			book.setIsbn(epubUtil.getISBN());
-			// 关键字(图书的名字)20
-			ebook.setKeywords(epubUtil.getBookTitle());
+			// 出版单位
+			book.setPublisher(epubUtil.getPublisher());
+			// 字数
+			book.setFontCount(epubUtil.getFontCount());
+			// 版次
+			book.setRevision(epubUtil.getRevision());
+			// 关键字
+			ebook.setKeywords(epubUtil.getKeywords());
+			// 开本
+			//book.setFormat(epubUtil.getFormat());
+			// 印张
+			//book.setPrintCount(epubUtil.getPrintCount());
+			// 页数
+		//	book.setTotalPages(epubUtil.getTotalPages());
+			//印次
+			//book.setPrintNo(epubUtil.getPrintNo());
+			//中图分类
+		//	book.setMidpicid(epubUtil.getMidpicid());
+			//邮编
+		//	book.setZipCode(epubUtil.getZipcode());
+			//CIP
+		//	book.setCIP(epubUtil.getCIP());
+			//承印
+			book.setPrint(epubUtil.getPrint());
+			//定价
+			ebook.setPrice(epubUtil.getPrice());
+			ebook.setPriceOption(1);
+			//售价
+			ebook.setRealPrice(epubUtil.getPrice());
 			// 保存封面
 			if(epubUtil.getCover() != null){
 				String imgName = epubUtil.getCover().getHref().substring(epubUtil.getCover().getHref().lastIndexOf("/") + 1);