--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java

@@ -138,7 +138,7 @@ public class EbookController {
 		List<Book> list = bookservice.selectByExample(example);
 		for (Book book2 : list) {
 			CreatreQRCodeForm qrFrom = new CreatreQRCodeForm();
-			qrFrom.setContent("/resource/wap/ebook/get?id=" + book2.getId());
+			qrFrom.setContent("http://test16.zhongdianyun.com:8708/wap/index.html#/pages/details/index?id="+book2.getId());
 			Calendar now = Calendar.getInstance();
 			qrFrom.setFileName(book2.getName() + now.get(Calendar.YEAR) + "年" + (now.get(Calendar.MONTH) + 1) + "月");
 			book2.setResourceQr(client.createImg(qrFrom));
@@ -642,7 +642,12 @@ public class EbookController {
 		ev.getBook().setBookSeries(ev.getBook().getAuthor());
 		
 		try {
+			CreatreQRCodeForm qrFrom = new CreatreQRCodeForm();
+			qrFrom.setContent("http://test16.zhongdianyun.com:8708/wap/index.html#/pages/details/index?id="+ev.getBook().getId());
+			qrFrom.setFileName(ev.getBook().getName()+ev.getBook().getYear()+"年"+ev.getBook().getPeriods()+"月");
+			ev.getBook().setResourceQr(client.createImg(qrFrom));
 			bookservice.insert(ev.getBook());
+			
 		} catch (Exception e) {
 			throw new BaseException(ev.getBook().getIsbn());
 		}
@@ -699,6 +704,21 @@ public class EbookController {
 			aldt.setDtId(ev.getDtId());
 			aldtservice.insertSelective(aldt);
 		});
+		// 删除当前对象与年份的关系
+		EbookMainBodyRelation relation = new EbookMainBodyRelation();
+		relation.setObjectId(ev.getEbook().getId());
+		ebookMainBodyRelationMapper.delete(relation);
+	
+	// 添加当前对象与年份的关系
+	if (ev.getBook().getYear() != null) {
+		EbookMainBodyRelation relationBody = new EbookMainBodyRelation();
+		relationBody.setObjectId(ev.getEbook().getId());
+		relationBody.setYearId(ev.getBook().getYearId());
+		relationBody.setYear(ev.getBook().getYear());
+		relationBody.setUploadTime(new Date());
+		relationBody.setMainBodyId(ev.getBook().getMainBodyId());
+		ebookMainBodyRelationMapper.insert(relationBody);
+	}
 		// 图片表
 		if (ev.getImageSet() != null && ev.getImageSet().size() > 0) {
 			int i = 1;

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

@@ -73,7 +73,6 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	public boolean saveOrUpdate(SaveUpdateEbookForm form) throws ParseException {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Book book = new Book();
-
 		BeanUtils.copyProperties(form, book);
 		if (book.getId() == null) {
 			book.setUploadTime(new Date());
@@ -118,9 +117,8 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 			}
 			bookMapper.insertSelective(book);
 			CreatreQRCodeForm qrFrom = new CreatreQRCodeForm();
-			qrFrom.setContent("/resource/wap/ebook/get?id="+book.getId());
-			Calendar now = Calendar.getInstance();
-			qrFrom.setFileName(book.getName()+now.get(Calendar.YEAR)+"年"+(now.get(Calendar.MONTH) + 1)+"月");
+			qrFrom.setContent("http://test16.zhongdianyun.com:8708/wap/index.html#/pages/details/index?id="+book.getId());
+			qrFrom.setFileName(book.getName()+book.getYear()+"年"+book.getPeriods()+"月");
 			book.setResourceQr(client.createImg(qrFrom));
 			bookMapper.updateByPrimaryKeySelective(book);