--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/EbookMainBodyRelation.java

@@ -22,6 +22,8 @@ public class EbookMainBodyRelation {
 	private String id;
 	@ApiModelProperty("资源id")
 	private String objectId;
+	@ApiModelProperty("杂志主体id")
+	private String mainBodyId;
 	@ApiModelProperty("年份id")
 	private String yearId;
 	@ApiModelProperty("年份")

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

@@ -30,9 +30,6 @@ import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyRelationMapper;
 public class EbookMainBodyServiceImpl extends BaseServiceImpl<EbookMainBody, String> implements EbookMainBodyService{
 	@Autowired
 	private EbookMainBodyMapper ebookMainBodyMapper;
-	@Autowired
-	private EbookMainBodyRelationMapper ebookMainBodyRelationMapper;
-
 	@Override
 	public BaseMapper<EbookMainBody> getMapper() {
 		// TODO Auto-generated method stub
@@ -58,22 +55,6 @@ public class EbookMainBodyServiceImpl extends BaseServiceImpl<EbookMainBody, Str
 				body.setPublishTime(sdf.parse(form.getPublishTime()));
 			}
 			ebookMainBodyMapper.updateByPrimaryKeySelective(body);
-			//删除当前对象与年份的关系
-			EbookMainBodyRelation relation = new  EbookMainBodyRelation();
-			relation.setObjectId(form.getId());
-			ebookMainBodyRelationMapper.delete(relation);
-		}
-		//添加当前对象与年份的关系
-		if(form.getPeriodsNumber() != null ){
-			String[] split = form.getPeriodsNumber().split(",");
-			for (String str : split) {
-				EbookMainBodyRelation relation = new  EbookMainBodyRelation();
-				relation.setObjectId(body.getId());
-				relation.setYearId(str);
-				relation.setYear(form.getYear());
-				relation.setUploadTime(new Date());
-				ebookMainBodyRelationMapper.insert(relation);
-			}
 		}
 		return true;
 	}

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

 package com.zrqx.resource.bg.service.ebook;
 
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -13,8 +12,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.zrqx.core.enums.AllResourceTypeEnum;
-import com.zrqx.core.enums.resource.EbookStatusEnum;
-import com.zrqx.core.enums.resource.PriceOptionEnum;
 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;
@@ -22,8 +19,8 @@ import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.model.resource.ebook.Ebook;
-import com.zrqx.core.model.resource.ebook.EbookDiyType;
 import com.zrqx.core.model.resource.ebook.EbookMainBody;
+import com.zrqx.core.model.resource.ebook.EbookMainBodyRelation;
 import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
 import com.zrqx.core.model.resource.year.YearLibrary;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -31,11 +28,10 @@ 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.ebook.BookMapper;
-import com.zrqx.resource.bg.mapper.ebook.EbookDiyTypeMapper;
 import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyMapper;
+import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyRelationMapper;
 import com.zrqx.resource.bg.mapper.ebook.EbookMapper;
 import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryMapper;
-import com.zrqx.resource.bg.mapper.year.PeriodsLibraryMapper;
 import com.zrqx.resource.bg.mapper.year.YearLibraryMapper;
 
 /**
@@ -57,6 +53,9 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	private EbookMainBodyMapper ebookMainBodyMapper;
 	@Autowired
 	private YearLibraryMapper yearLibraryMapper;
+	@Autowired
+	private EbookMainBodyRelationMapper ebookMainBodyRelationMapper;
+
 	/*@Autowired
 	private PeriodsLibraryMapper ebookMainBodyMapper;*/
 
@@ -153,6 +152,20 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 				}
 			}
 			bookMapper.updateByPrimaryKey(book);
+			//删除当前对象与年份的关系
+			EbookMainBodyRelation relation = new  EbookMainBodyRelation();
+			relation.setObjectId(form.getId());
+			ebookMainBodyRelationMapper.delete(relation);
+		}
+		//添加当前对象与年份的关系
+		if(book.getYearId() != null ){
+			EbookMainBodyRelation relation = new  EbookMainBodyRelation();
+			relation.setObjectId(book.getId());
+			relation.setYearId(book.getYearId());
+			relation.setYear(book.getYear());
+			relation.setUploadTime(new Date());
+			relation.setMainBodyId(book.getMainBodyId());
+			ebookMainBodyRelationMapper.insert(relation);
 		}
 		return true;
 	}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java

@@ -65,6 +65,7 @@ public class FgEbookController {
 		if(form.getType().equals("1")) {
 			//杂志
 			list = bookservice.pageBook(form, pageParam);
+			
 		}else if(form.getType().equals("2")) {
 			list = articleLibraryService.page(form, pageParam);
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookMainBodyController.java

 package com.zrqx.resource.fg.controller.ebook;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,12 +54,14 @@ public class FgEbookMainBodyController {
 		List<YearLibrary> list = new ArrayList<YearLibrary>();
 		FgEbookMainBodyVO vo = new FgEbookMainBodyVO();
 		Example example = ebookMainBodyRelationService.createExample();
-		example.and().andEqualTo("objectId",oid);
+		example.and().andEqualTo("mainBodyId",oid);
 		List<EbookMainBodyRelation> ebookList = ebookMainBodyRelationService.selectByExample(example);
 			for (EbookMainBodyRelation ebookMainBodyRelation : ebookList) {
 				YearLibrary library = yearLibraryService.queryByUploadAsc(ebookMainBodyRelation.getYearId()).get(0);
 				list.add(library);
 			}	
+			Set set = new HashSet(list);
+	        List tempList = new ArrayList(set);
 			vo.setYear(list);
 		return CallBack.success(vo);
 	}