--no commit message

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

@@ -197,7 +197,7 @@ public class EpubResolve {
 			// 章节标识号
 			// chapter.setMarkid(book.getId()+"-"+(spineReference.getFragmentId()));
 			if (spineReference.getFragmentId() != null && !spineReference.getFragmentId().equals("")) {
-				chapter.setMarkid(ebook.getId() + "-" + spineReference.getFragmentId());
+				chapter.setMarkid(ebook.getId() + "-" +spineReference.getResourceId()+"-"+ spineReference.getFragmentId());
 			} else {
 				chapter.setMarkid(ebook.getId() + "-" + spineReference.getResourceId());
 			}
@@ -207,7 +207,7 @@ public class EpubResolve {
 
 			// 父章节名称
 			if (refe.getFragmentId() != null && !refe.getFragmentId().equals("")) {
-				chapter.setPid(ebook.getId() + "-" + refe.getFragmentId());
+				chapter.setPid(ebook.getId() + "-" +spineReference.getResourceId()+"-"+ refe.getFragmentId());
 			} else if (refe.getResourceId() != null) {
 				chapter.setPid(ebook.getId() + "-" + refe.getResourceId());
 			} else {
@@ -380,7 +380,7 @@ public class EpubResolve {
 			// 顶级目录 用resourceId 标识
 			String resourceId = "";
 			if (spineReference.getFragmentId() != null && !spineReference.getFragmentId().equals("")) {
-				resourceId = spineReference.getFragmentId();
+				resourceId = spineReference.getResourceId()+"-"+spineReference.getFragmentId();
 			} else {
 				resourceId = spineReference.getResourceId();
 			}
@@ -472,7 +472,7 @@ public class EpubResolve {
 						if (tagName.equals("h1")) {
 							markid = ebook.getId() + "-" + resourceId.replace("|", "");
 						} else {
-							markid = ebook.getId() + "-" + (hlabel1.attr("id").replace("|", "").equals("") ? resourceId : hlabel1.attr("id").replace("|", ""));
+							markid = ebook.getId() + "-" + (hlabel1.attr("id").replace("|", "").equals("") ? resourceId :spineReference.getResourceId()+"-"+ hlabel1.attr("id").replace("|", ""));
 						}
 						for (Element element : subchapter) {
 							if (!element.toString().contains("<h")) {