--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookService.java

@@ -2,19 +2,13 @@ package com.zrqx.resource.bg.service.ebook;
 
 import java.util.List;
 
-import org.springframework.web.multipart.MultipartFile;
-
-import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.ebook.QueryEbookInfoForm;
-import com.zrqx.core.form.resource.bg.ebook.SaveEbookForm;
 import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookForm;
 import com.zrqx.core.model.resource.ebook.Ebook;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.vo.label.ImportLabelVo;
 import com.zrqx.core.vo.resource.ebook.EbookListVO;
-import com.zrqx.core.vo.resource.ebook.ExcelEbookListVo;
 
 /**
  * 电子书-service

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java

@@ -4,7 +4,6 @@ package com.zrqx.resource.bg.service.ebook;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,15 +13,16 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Ebook;
 import com.zrqx.core.model.resource.ebook.EbookDiyType;
 import com.zrqx.core.model.resource.ebook.EbookImage;
+import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.ebook.EbookListVO;
-import com.zrqx.resource.bg.mapper.diytype.DiyTypeMapper;
 import com.zrqx.resource.bg.mapper.ebook.EBookImageMapper;
 import com.zrqx.resource.bg.mapper.ebook.EbookDiyTypeMapper;
 import com.zrqx.resource.bg.mapper.ebook.EbookMapper;
+import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryMapper;
 
 /**
  * 电子书-serviceimpl
@@ -34,13 +34,13 @@ import com.zrqx.resource.bg.mapper.ebook.EbookMapper;
 public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements EbookService {
 
 	@Autowired
-	private EBookImageMapper bookMapper;
+	private EBookImageMapper bookImageMapper;
 	@Autowired
 	private EbookMapper ebookMapper;
 	@Autowired
-	private DiyTypeMapper diyTypeMapper;
-	@Autowired
 	private EbookDiyTypeMapper ebookDiyTypeMapper;
+	@Autowired
+	private PdfLibraryMapper pdfLibraryMapper;
 	@Override
 	public BaseMapper<Ebook> getMapper() {
 		return ebookMapper;
@@ -58,53 +58,73 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	 */
 	@Override
 	public boolean saveOrUpdate(SaveUpdateEbookForm form) {
-		EbookImage book = new EbookImage();
 		Ebook ebook = new Ebook();
-		if(StringUtils.isNotBlank(form.getAuthorNameAndId())){
-			String[] authorNameAndId = form.getAuthorNameAndId().split(",");
-			form.setAuthor(authorNameAndId[0]);
-			form.setAuthorId("");
-			if(authorNameAndId.length > 1){
-				form.setAuthorId(authorNameAndId[1]);
-			}
+		BeanUtils.copyProperties(form, ebook);
+		if (ebook.getId() == null) {
+			ebook.setUploadTime(new Date());
+			if(form.getPdfResourceType()!=null ){
+				if(form.getPdfResourceType().equals(1)){
+					PdfLibrary pdf=new PdfLibrary();
+					pdf.setPdf(form.getPdfId());
+					pdf.setName(form.getPdfName());
+					pdf.setUploadTime(new Date());
+					pdf.setStatus(0);
+					pdfLibraryMapper.insert(pdf);
+					ebook.setPdfId(pdf.getId());
+					ebook.setPdfName(pdf.getName());
 				}
-		if(StringUtils.isNotBlank(form.getTranslatorNameAndId())){
-			String[] translatorNameAndId = form.getTranslatorNameAndId().split(",");
-			form.setTranslator(translatorNameAndId[0]);
-			form.setTranslatorId("");
-			if(translatorNameAndId.length > 1){
-				form.setTranslatorId(translatorNameAndId[1]);
+				if(form.getPdfResourceType().equals(2)){
+					ebook.setPdfId(form.getPdfId());
+					ebook.setPdfName(form.getName());
 				}
 			}
-		form.setPublishTime(form.getPublishTime()+"-01");
-		BeanUtils.copyProperties(form, book);
-		BeanUtils.copyProperties(form, ebook);
-		if (book.getId() == null) {
-			bookMapper.insertSelective(book);
-			ebook.setId(book.getId());
-			ebook.setUploadTime(new Date());
 			ebookMapper.insertSelective(ebook);
 		} else {
-			Ebook e = ebookMapper.selectByPrimaryKey(book.getId());
-			bookMapper.updateByPrimaryKeySelective(book);
+			ebook = ebookMapper.selectByPrimaryKey(form.getId());
 			ebook.setUpdateTime(new Date());
-			ebookMapper.updateByPrimaryKeySelective(ebook);
-			if(form.getPrice() == null){
-				Ebook a = ebookMapper.selectByPrimaryKey(ebook.getId());
-				a.setPrice(form.getPrice());
-				ebookMapper.updateByPrimaryKey(a);
+			if(form.getPdfResourceType()!=null ){
+				if(form.getPdfResourceType().equals(1)){
+					PdfLibrary pdf=new PdfLibrary();
+					pdf.setName(form.getPdfName());
+					pdf.setPdf(form.getId());
+					pdf.setUploadTime(new Date());
+					pdf.setStatus(0);
+					pdfLibraryMapper.insert(pdf);
+					ebook.setPdfId(pdf.getId());
+					ebook.setPdfName(pdf.getName());
+					}
+				if(form.getPdfResourceType().equals(2)){
+					ebook.setPdfId(form.getPdfId());
+					ebook.setPdfName(form.getName());
 				}
+			}
+			ebookMapper.updateByPrimaryKeySelective(ebook);
 			// 删除原有关系表中的关系
 			EbookDiyType ebdt = new EbookDiyType();
 			ebdt.setEbookId(ebook.getId());
 			ebookDiyTypeMapper.delete(ebdt);
+			// 删除封面轮播
+			EbookImage image = new EbookImage();
+			image.setEbookId(ebook.getId());
+			bookImageMapper.delete(image);
 		}
 		// 添加关系
 		if (form.getDiyType() != null && form.getDiyType().size() > 0) {
 			List<EbookDiyType> dtlist = form.getDiyType();
-			dtlist.forEach(li -> li.setEbookId(ebook.getId()));
+			for (EbookDiyType ebookDiyType : dtlist) {
+				ebookDiyType.setEbookId(ebook.getId());
+			}
 			ebookDiyTypeMapper.insertList(dtlist);
 		}
+		// 添加图片轮播
+		if (form.getEbookImage() != null && form.getEbookImage().size() > 0) {
+			List<EbookImage> imagelist = form.getEbookImage();
+			for (EbookImage image : imagelist) {
+				image.setEbookId(ebook.getId());
+				image.setCover(image.getCover());
+			}
+			bookImageMapper.insertList(imagelist);
+		}
 		return true;
 	}
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibrarySerivceImpl.java

@@ -67,13 +67,11 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
 			}
 			//删除当前对象与自定义分类的关系
 			PdfLibraryDiyType old = new PdfLibraryDiyType();
-			old.setPlId(entity.getId());
 			pdrMapper.delete(old);
 		}
 		//添加当前对象与自定义分类的关系
 		if(form.getDiyType() != null && form.getDiyType().size() > 0){
 			List<PdfLibraryDiyType> list = form.getDiyType();
-			list.forEach(li -> li.setPlId(entity.getId()));
 			pdrMapper.insertList(list);
 		}
 		return true;
@@ -106,7 +104,6 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
 				PdfLibraryDiyType pdfLibraryDiyType = new PdfLibraryDiyType();
 				pdfLibraryDiyType.setCode(form.getDiyType().getCode()); 
 				pdfLibraryDiyType.setDtId(form.getDiyType().getDtId());
-				pdfLibraryDiyType.setPlId(obj.getId());
 				pdrMapper.insert(pdfLibraryDiyType);	
 			}
 		}