--no commit message

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

@@ -54,7 +54,7 @@ public class EpubController {
 
 	@ApiOperation(value = "epub上传 返回token")
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
-	public String upload(String code, Integer nationsType, @RequestParam("file") MultipartFile file) throws Exception {
+	public String upload(Integer dtId ,String code, Integer nationsType, @RequestParam("file") MultipartFile file) throws Exception {
 		// 获取原文件的全名称
 		String originalFilename = file.getOriginalFilename();
 		// 源文件的名称,不带后缀
@@ -66,6 +66,7 @@ public class EpubController {
 			throw new BaseException("epub已存在");
 		}
 		ev.setCode(code);
+		ev.setDtId(dtId);
 
 		Ebook ebook = new Ebook();
 		Book book = new Book();
@@ -74,7 +75,7 @@ public class EpubController {
 		EpubUtil epubUtil = new EpubUtil();
 		// epub解析方法类
 		EpubResolve er = new EpubResolve();
-		book.setNationsType(nationsType);
+		//book.setNationsType(nationsType);
 		epubUtil.setEpubFile(file.getInputStream());
 		FileInfo entity = er.uploadFile(file, rootPath + fileName);
 		if (!service.insert(entity)) {
@@ -118,7 +119,9 @@ public class EpubController {
 			}
 			ebook.setCssPath(cssentity.getPath());
 			// 保存封面
-			ebook.setBookCover(epubUtil.getCover().getHref());
+			if(epubUtil.getCover() != null){
+				ebook.setImg(epubUtil.getCover().getHref());
+			}
 
 			ev.setEbook(ebook);
 
@@ -177,7 +180,7 @@ public class EpubController {
 				// il.setImage(relativeBookFolderPath + file.getPath());
 				il.setUploadTime(new Date());
 				il.setBookId(book.getId());
-				il.setNationsType(book.getNationsType());
+				//il.setNationsType(book.getNationsType());
 				il.setBookName(book.getName());
 				il.setStatus(0);
 				il.setImage(file.getFileName());

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

@@ -212,14 +212,14 @@ public class EpubResolve {
 			if (StringUtils.anyContains(spineReference.getTitle().replaceAll("[ 　]", ""), "序,序言,前言,摘要,内容简介")) {
 				String doc = getDocument(spineReference).select("h1,h2,h3,h4,h5,p,div,img").text().replace(spineReference.getTitle(), spineReference.getTitle() + "　　");
 				intro = doc.substring(0, doc.length() < 500 ? doc.length() : 500);
-				ebook.setSummary(intro);
+				ebook.setSynopsis(intro);
 			} else {
 
 				if (spineReference.getTitle().replaceAll("[ 　]", "").contains("目录")) {
 					TOCReference reference = listReferences.get(index + 1);
 					String doc = getDocument(reference).select("h1,h2,h3,h4,h5,p,div,img").text().replace(spineReference.getTitle(), spineReference.getTitle() + "　　");
 					intro = doc.substring(0, doc.length() < 500 ? doc.length() : 500);
-					ebook.setSummary(intro);
+					ebook.setSynopsis(intro);
 				}
 			}
 
@@ -453,7 +453,7 @@ public class EpubResolve {
 				ArticleLibrary content = new ArticleLibrary();
 				// 当前章节标题
 				String title = spineReference.getTitle();// elements.get(0).toString().contains("<h")?elements.get(0).text():
-				content.setTitle(title);// 标题
+				content.setName(title);// 标题
 
 				// markid
 				content.setMarkid(ebook.getId() + "-" + resourceId);
@@ -501,7 +501,7 @@ public class EpubResolve {
 
 						ArticleLibrary content = new ArticleLibrary();
 						// 内容信息(6)
-						content.setTitle(hlabel1.text());
+						content.setName(hlabel1.text());
 
 						// 章节内容
 						content.setText(es.toString());// 内容