--no commit message

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

@@ -48,6 +48,7 @@ import com.zrqx.resource.commons.model.ebook.Book;
 import com.zrqx.resource.commons.model.ebook.Ebook;
 import com.zrqx.resource.commons.model.ebook.EbookDiyType;
 import com.zrqx.resource.commons.model.membercollection.MemberCollection;
+import com.zrqx.resource.commons.model.pdffilelibrary.PdfLibrary;
 import com.zrqx.resource.commons.model.record.Record;
 import com.zrqx.resource.commons.model.resourcerelation.ResourceRelation;
 import com.zrqx.resource.commons.vo.bg.ebook.EbookListVO;
@@ -71,7 +72,7 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	private EbookMapper ebookMapper;
 	@Autowired
 	private StatisticsClient statisticsClient;
-	
+
 	@Autowired
 	private EbookDiyTypeMapper ebookDiyTypeMapper;
 	@Autowired
@@ -88,10 +89,10 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	private ImportUtil importUtil;
 	@Autowired
 	private DiyTypeMapper diyTypeMapper;
-	
+
 	@Autowired
 	private PdfLibraryService pdfLibraryService;
-	
+
 	@Override
 	public BaseMapper<Ebook> getMapper() {
 		return ebookMapper;
@@ -102,21 +103,20 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	 * 
 	 * @Title build
 	 * @param entity
-	 * @param old
-	 *            void
+	 * @param old    void
 	 * @author Conan
 	 * @date 2018年6月15日 下午1:48:32
 	 */
 	/*
 	 * private void build(Ebook entity, Ebook old) { Date date = new Date();
-	 * entity.setUpdateDate(date); if (old == null) {
-	 * entity.setCreateDate(date); entity.setOpName(redisManage.getOpName());
+	 * entity.setUpdateDate(date); if (old == null) { entity.setCreateDate(date);
+	 * entity.setOpName(redisManage.getOpName());
 	 * entity.setOpId(redisManage.getOpId());
 	 * //entity.setUopName(redisManagegetOpName());
 	 * //entity.setUopId(redisManagegetOpId()); } else { // 保留 原 创建人 和 创建时间
-	 * entity.setCreateDate(old.getCreateDate());
-	 * entity.setOpId(old.getUopId()); entity.setOpName(old.getOpName()); // 更新
-	 * 修改人 和 修改时间 entity.setUopId(redisManage.getOpId());
+	 * entity.setCreateDate(old.getCreateDate()); entity.setOpId(old.getUopId());
+	 * entity.setOpName(old.getOpName()); // 更新 修改人 和 修改时间
+	 * entity.setUopId(redisManage.getOpId());
 	 * entity.setUopName(redisManage.getOpName()); } }
 	 */
 
@@ -124,34 +124,37 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	public boolean saveOrUpdate(SaveUpdateEbookForm form) {
 		Book book = new Book();
 		Ebook ebook = new Ebook();
-		if(StringUtils.isNotBlank(form.getAuthorNameAndId())){
+		if (StringUtils.isNotBlank(form.getAuthorNameAndId())) {
 			String[] authorNameAndId = form.getAuthorNameAndId().split(",");
 			form.setAuthor(authorNameAndId[0]);
-			if(authorNameAndId.length > 1){
+			if (authorNameAndId.length > 1) {
 				form.setAuthorId(authorNameAndId[1]);
 			}
 		}
-		if(StringUtils.isNotBlank(form.getTranslatorNameAndId())){
+		if (StringUtils.isNotBlank(form.getTranslatorNameAndId())) {
 			String[] translatorNameAndId = form.getTranslatorNameAndId().split(",");
 			form.setTranslator(translatorNameAndId[0]);
-			if(translatorNameAndId.length > 1){
+			if (translatorNameAndId.length > 1) {
 				form.setTranslatorId(translatorNameAndId[1]);
 			}
 		}
-		if(form.getPublishTime()!=null && form.getPublishTime()!="") {
-			form.setPublishTime(form.getPublishTime()+"-01");
+		if (form.getPublishTime() != null && form.getPublishTime() != "") {
+			form.setPublishTime(form.getPublishTime() + "-01");
 		}
 		BeanUtils.copyProperties(form, book);
 		BeanUtils.copyProperties(form, ebook);
-		if(PriceOptionEnum.STATUS_0.getCode().equals(ebook.getPriceOption())){
+		if (PriceOptionEnum.STATUS_0.getCode().equals(ebook.getPriceOption())) {
 			ebook.setRealPrice(new BigDecimal(0));
 		}
-		if(form.getPdfType() == 2) {
-		SaveUpdatePdfLibraryForm pdflibrary = new SaveUpdatePdfLibraryForm();
-		pdflibrary.setPdf(form.getPdfFile());
-		pdflibrary.setPdfName(form.getPdfName());
-		pdflibrary.setName(form.getPdfName());
-		pdfLibraryService.saveOrUpdate(pdflibrary);
+
+		if (form.getPdfType() == 2) {
+			if (StringUtils.isNotBlank(form.getPdfFile())) {
+				SaveUpdatePdfLibraryForm pdflibrary = new SaveUpdatePdfLibraryForm();
+				pdflibrary.setPdf(form.getPdfFile());
+				pdflibrary.setPdfName(form.getPdfName());
+				pdflibrary.setName(form.getPdfName());
+				pdfLibraryService.saveOrUpdate(pdflibrary);
+			}
 		}
 		// 默认电子书
 		Integer bookType = 1;
@@ -160,18 +163,18 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 //			if((bookType.equals(0) || bookType.equals(1)) && ((StringUtils.isBlank(ebook.getEpubFile())) && (StringUtils.isBlank(ebook.getPdfFile())))){
 //				throw new BaseException("请添加相关PDF资源");
 //			}
-			
+
 			book.setResourceType(AllResourceTypeEnum.BOOK.getCode());
 			book.setSalesNum(0);
 			bookMapper.insertSelective(book);
 			ebook.setId(book.getId());
-			ebook.setBookStatus(EbookStatusEnum._5.getCode());	// 默认已下架
+			ebook.setBookStatus(EbookStatusEnum._5.getCode()); // 默认已下架
 			ebook.setUploadTime(new Date());
 			ebook.setOffShelvesTime(new Date());
-			ebook.setBrowseNum(0);	//浏览量	
+			ebook.setBrowseNum(0); // 浏览量
 			ebook.setGoodsType(GoodsTypeEnum.EBOOK.getCode());
 			ebookMapper.insertSelective(ebook);
-		} else { 
+		} else {
 			bookMapper.updateByPrimaryKeySelective(book);
 			ebook.setUpdateTime(new Date());
 			ebookMapper.updateByPrimaryKeySelective(ebook);
@@ -194,9 +197,9 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	@Override
 	public boolean batchInsert(SaveEbookForm form) {
 		// TODO Auto-generated method stub
-				return false;
+		return false;
 	}
-	
+
 	@Override
 	public boolean batchDelete(List<String> ids) {
 		Example example = new Example(Ebook.class);
@@ -213,26 +216,25 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 		example = new Example(EbookDiyType.class);
 		example.createCriteria().andIn("ebookId", ids);
 		ebookDiyTypeMapper.deleteByExample(example);
-		
+
 		// ----关联资源
 		example = new Example(ResourceRelation.class);
 		example.createCriteria().andIn("objectId", ids).orIn("resourceId", ids);
 		resourceRelationMapper.deleteByExample(example);
-		
-		//删除资源订单相关信息
+
+		// 删除资源订单相关信息
 		orderClient.deleteOrder(ids);
-		//删除资源收藏相关信息
+		// 删除资源收藏相关信息
 		example = new Example(MemberCollection.class);
 		example.createCriteria().andIn("objectId", ids);
 		memberCollectionMapper.deleteByExample(example);
-		//删除资源浏览记录相关信息
+		// 删除资源浏览记录相关信息
 		example = new Example(Record.class);
 		example.createCriteria().andIn("goodsId", ids);
 		recordMapper.deleteByExample(example);
 		return true;
 	}
 
-
 	@Override
 	public PageInfo<EbookListVO> page(QueryEbookInfoForm form, PageParam pageParam) {
 		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
@@ -240,51 +242,51 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 		}
 		startPage(pageParam);
 		List<EbookListVO> list = ebookMapper.page(form);
-		list.stream().forEach( li -> li.setStatus_zh(EbookStatusEnum.getName(li.getBookStatus())));
+		list.stream().forEach(li -> li.setStatus_zh(EbookStatusEnum.getName(li.getBookStatus())));
 		return new PageInfo<EbookListVO>(list);
 	}
 
 	@Override
 	public PageInfo<EbookListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
-		if(pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())){
+		if (pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())) {
 			pageParam.setOrderBy("uploadTime desc");
 		}
 		startPage(pageParam);
 		List<EbookListVO> list = ebookMapper.queryByTileAndDiyType(form);
-		if(!list.isEmpty()){
-			for(EbookListVO ebookListVO : list){
+		if (!list.isEmpty()) {
+			for (EbookListVO ebookListVO : list) {
 				ebookListVO.setStatus_zh(EbookStatusEnum.getName(ebookListVO.getBookStatus()));
-			}	
+			}
 		}
 		return new PageInfo<EbookListVO>(list);
 	}
 
 	@Override
 	public Integer saveBook(MultipartFile file, String classifyCode) throws Exception {
-		
 
 		return 1;
 	}
-	
+
 	/**
 	 * 更新信息
+	 * 
 	 * @param form
 	 * @author ycw
 	 * @date: 2020年4月21日 下午4:25:45
 	 */
-	private void updateOtherInfo(SaveUpdateEbookForm form){
+	private void updateOtherInfo(SaveUpdateEbookForm form) {
 		Ebook eb = ebookMapper.selectByPrimaryKey(form.getId());
 		Book b = bookMapper.selectByPrimaryKey(form.getId());
-		if(form.getPrice() == null){
+		if (form.getPrice() == null) {
 			eb.setPrice(null);
 		}
-		if(form.getRealPrice() == null){
+		if (form.getRealPrice() == null) {
 			eb.setRealPrice(null);
 		}
-		if(StringUtils.isBlank(form.getAuthorId())){
+		if (StringUtils.isBlank(form.getAuthorId())) {
 			b.setAuthorId(null);
 		}
-		if(StringUtils.isBlank(form.getTranslatorId())){
+		if (StringUtils.isBlank(form.getTranslatorId())) {
 			b.setTranslatorId(null);
 		}
 		ebookMapper.updateByPrimaryKey(eb);
@@ -299,26 +301,27 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 		List<ExcelEbookImportVo> ebookImportList = null;
 		// 结果集
 		ImportLabelVo vo = new ImportLabelVo();
-		//PackageLabelRelation packageLabelRelation = new PackageLabelRelation();
-		//解析Excel文件
+		// PackageLabelRelation packageLabelRelation = new PackageLabelRelation();
+		// 解析Excel文件
 		try {
-			ebookImportList = ExcelUtil.importExcel(file.getInputStream(), ExcelEbookImportVo.class, file.getOriginalFilename());
+			ebookImportList = ExcelUtil.importExcel(file.getInputStream(), ExcelEbookImportVo.class,
+					file.getOriginalFilename());
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 		// 验证数据
-		if (ebookImportList == null || ebookImportList.isEmpty()){
+		if (ebookImportList == null || ebookImportList.isEmpty()) {
 			vo.setMsg("文件解析数据为0");
 			return vo;
-		} 
-		
+		}
+
 		for (ExcelEbookImportVo excelEbookImportVo : ebookImportList) {
 			String isbn = null;
-			if(StringUtils.isNoneBlank(excelEbookImportVo.getIsbn())){
-				isbn = excelEbookImportVo.getIsbn().replace("-", "");	
+			if (StringUtils.isNoneBlank(excelEbookImportVo.getIsbn())) {
+				isbn = excelEbookImportVo.getIsbn().replace("-", "");
 			}
 			Book book = bookMapper.getIsbn(isbn);
-			if(book==null ) {
+			if (book == null) {
 				Book b = new Book();
 				Ebook ebook = new Ebook();
 				BeanUtils.copyProperties(excelEbookImportVo, b);
@@ -326,28 +329,29 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 				ebook.setPreType(1);
 				b.setIsbn(isbn.replace("-", ""));
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-				if(excelEbookImportVo.getPublishTime()!=null) {
+				if (excelEbookImportVo.getPublishTime() != null) {
 					String format = sdf.format(excelEbookImportVo.getPublishTime());
 					b.setPublishTime(format);
 				}
 				bookMapper.insert(b);
 				ebook.setId(b.getId());
 				ebook.setRealPrice(new BigDecimal(excelEbookImportVo.getPrice()));
-				if(ebook.getRealPrice()!=null || !ebook.getRealPrice().equals("")) {
+				if (ebook.getRealPrice() != null || !ebook.getRealPrice().equals("")) {
 					ebook.setPriceOption(1);
-				}else {
+				} else {
 					ebook.setPriceOption(0);
 				}
-				ebook.setBookStatus(5);//没有EPUB文件的书下架
+				ebook.setBookStatus(5);// 没有EPUB文件的书下架
 				ebook.setUploadTime(new Date());
-				
+
 				ebookMapper.insert(ebook);
-				//查询所属一级分类
+				// 查询所属一级分类
 				DiyType diyType = new DiyType();
 				diyType.setTypeName(excelEbookImportVo.getDiyTypeName_1());
 				DiyType type1 = diyTypeMapper.selectOne(diyType);
-				//查询所属二级分类
-				DiyType diyTypeCode = diyTypeMapper.getDiyTypeCode(excelEbookImportVo.getDiyTypeName_2(),type1.getId());
+				// 查询所属二级分类
+				DiyType diyTypeCode = diyTypeMapper.getDiyTypeCode(excelEbookImportVo.getDiyTypeName_2(),
+						type1.getId());
 				EbookDiyType ebookDiyType = new EbookDiyType();
 				ebookDiyType.setEbookId(b.getId());
 				ebookDiyTypeMapper.delete(ebookDiyType);
@@ -356,75 +360,77 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 				edt.setDtId(diyTypeCode.getId());
 				edt.setEbookId(b.getId());
 				ebookDiyTypeMapper.insert(edt);
-			}else {
-					Ebook ebook = ebookMapper.selectByPrimaryKey(book.getId());
-					BeanUtils.copyPropertiesIgnoreNotNull(excelEbookImportVo, book,book);
-					BeanUtils.copyPropertiesIgnoreNotNull(excelEbookImportVo, ebook,ebook);
-					book.setIsbn(isbn.replace("-", ""));
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-					if(excelEbookImportVo.getPublishTime()!=null) {
-						String format = sdf.format(excelEbookImportVo.getPublishTime());
-						book.setPublishTime(format);
-					}
-					bookMapper.updateByPrimaryKeySelective(book);
-					ebook.setId(book.getId());
-					ebook.setRealPrice(new BigDecimal(excelEbookImportVo.getPrice()));
-					ebook.setBookStatus(4);
-					ebook.setUpdateTime(new Date());
-					ebookMapper.updateByPrimaryKeySelective(ebook);
-					//查询所属一级分类
-					DiyType diyType = new DiyType();
-					diyType.setTypeName(excelEbookImportVo.getDiyTypeName_1());
-					DiyType type1 = diyTypeMapper.selectOne(diyType);
-					if(type1!=null) {
-						//查询所属二级分类
-						DiyType diyTypeCode = diyTypeMapper.getDiyTypeCode(excelEbookImportVo.getDiyTypeName_2(),type1.getId());
-						EbookDiyType ebookDiyType = new EbookDiyType();
-						ebookDiyType.setEbookId(book.getId());
-						ebookDiyTypeMapper.delete(ebookDiyType);
-						EbookDiyType edt = new EbookDiyType();
-						if(diyTypeCode==null) {
-							edt.setCode(type1.getCode());
-							edt.setDtId(type1.getId());
-						}else {
-							edt.setCode(diyTypeCode.getCode());
-							edt.setDtId(diyTypeCode.getId());
-						}
-						
-						edt.setEbookId(book.getId());
-						ebookDiyTypeMapper.insert(edt);
+			} else {
+				Ebook ebook = ebookMapper.selectByPrimaryKey(book.getId());
+				BeanUtils.copyPropertiesIgnoreNotNull(excelEbookImportVo, book, book);
+				BeanUtils.copyPropertiesIgnoreNotNull(excelEbookImportVo, ebook, ebook);
+				book.setIsbn(isbn.replace("-", ""));
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				if (excelEbookImportVo.getPublishTime() != null) {
+					String format = sdf.format(excelEbookImportVo.getPublishTime());
+					book.setPublishTime(format);
+				}
+				bookMapper.updateByPrimaryKeySelective(book);
+				ebook.setId(book.getId());
+				ebook.setRealPrice(new BigDecimal(excelEbookImportVo.getPrice()));
+				ebook.setBookStatus(4);
+				ebook.setUpdateTime(new Date());
+				ebookMapper.updateByPrimaryKeySelective(ebook);
+				// 查询所属一级分类
+				DiyType diyType = new DiyType();
+				diyType.setTypeName(excelEbookImportVo.getDiyTypeName_1());
+				DiyType type1 = diyTypeMapper.selectOne(diyType);
+				if (type1 != null) {
+					// 查询所属二级分类
+					DiyType diyTypeCode = diyTypeMapper.getDiyTypeCode(excelEbookImportVo.getDiyTypeName_2(),
+							type1.getId());
+					EbookDiyType ebookDiyType = new EbookDiyType();
+					ebookDiyType.setEbookId(book.getId());
+					ebookDiyTypeMapper.delete(ebookDiyType);
+					EbookDiyType edt = new EbookDiyType();
+					if (diyTypeCode == null) {
+						edt.setCode(type1.getCode());
+						edt.setDtId(type1.getId());
+					} else {
+						edt.setCode(diyTypeCode.getCode());
+						edt.setDtId(diyTypeCode.getId());
 					}
+
+					edt.setEbookId(book.getId());
+					ebookDiyTypeMapper.insert(edt);
 				}
 			}
+		}
 		return vo;
 	}
 
 	@Override
 	public ImportResult importFile(MultipartFile file) {
-		ImportResult s = importUtil.importExcel(file, ExcelBookExportVo.class, this :: save,
-				this :: verificationIsbn,this :: verificationName);
-		return s;	
+		ImportResult s = importUtil.importExcel(file, ExcelBookExportVo.class, this::save, this::verificationIsbn,
+				this::verificationName);
+		return s;
 	}
-	
+
 	public void save(ExcelBookExportVo vo) {
 		Book book = new Book();
 		BeanUtils.copyProperties(vo, book);
 		bookMapper.insert(book);
 	}
-	
+
 	public String verificationIsbn(ExcelBookExportVo vo) {
-		if(StringUtils.isBlank(vo.getIsbn())) {
+		if (StringUtils.isBlank(vo.getIsbn())) {
 			return "isbn不能为空";
 		}
 		return null;
 	}
+
 	public String verificationName(ExcelBookExportVo vo) {
-		if(StringUtils.isBlank(vo.getName())) {
+		if (StringUtils.isBlank(vo.getName())) {
 			return "标题不能为空";
 		}
 		return null;
 	}
-	
+
 	@Override
 	public PageInfo<StatisticsResourceVo> getStatisticsResource(SearchForm form, PageParam pageParam) {
 		startPage(pageParam);