--no commit message

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

@@ -60,6 +60,8 @@ import com.zrqx.core.util.excelutil.ImportResult;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.resource.bg.mapper.RelationAuthorMapper;
+import com.zrqx.resource.bg.mapper.authorLibrary.AuthorLibraryMapper;
 import com.zrqx.resource.bg.service.RelationAuthorService;
 import com.zrqx.resource.bg.service.RelationService;
 import com.zrqx.resource.bg.service.ResourceRelationService;
@@ -67,6 +69,7 @@ import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleToAudioService;
 import com.zrqx.resource.bg.service.articlelibrary.ChapterLibraryService;
+import com.zrqx.resource.bg.service.authorLibrary.AuthorLibraryService;
 import com.zrqx.resource.bg.service.ebook.EbookDiyTypeService;
 import com.zrqx.resource.bg.service.ebook.EbookLabelContentDiyTypeService;
 import com.zrqx.resource.bg.service.ebook.EbookService;
@@ -80,6 +83,7 @@ import com.zrqx.resource.bg.service.qrcode.QrCodeService;
 import com.zrqx.resource.bg.service.recommend.RecommendResourceService;
 import com.zrqx.resource.bg.service.record.RecordService;
 import com.zrqx.resource.bg.service.shoppingcart.ShoppingCartService;
+import com.zrqx.resource.commons.form.bg.authorLibrary.SaveUpdateAuthorForm;
 import com.zrqx.resource.commons.form.bg.ebook.QueryEbookInfoForm;
 import com.zrqx.resource.commons.form.bg.ebook.SaveUpdateEbookForm;
 import com.zrqx.resource.commons.form.bg.ebook.UpdateEbookForm;
@@ -99,6 +103,7 @@ import com.zrqx.resource.commons.util.WebTTSWSUtil;
 import com.zrqx.resource.commons.util.WebTTSWSUtil.Data;
 import com.zrqx.resource.commons.util.WebTTSWSUtil.ResponseData;
 import com.zrqx.resource.commons.vo.bg.EpubVo;
+import com.zrqx.resource.commons.vo.bg.authorlibrary.AuthorLibraryListVO;
 import com.zrqx.resource.commons.vo.bg.ebook.EbookListVO;
 import com.zrqx.resource.commons.vo.bg.ebook.EbookVO;
 
@@ -173,6 +178,12 @@ public class EbookController {
 	private SysuserClient sysuserClient;
 	@Autowired
 	private QrCodeService qrCodeService;
+	@Autowired
+	private RelationAuthorMapper bookAuthorMapper;
+	@Autowired
+	private AuthorLibraryService authorLibraryService;
+	@Autowired
+	private AuthorLibraryMapper authorLibraryMapper;
 	@Value("${qrcode-upload-path}")
 	private String qrCodeUploadPath;
 	@Value("${realm-name-path}")
@@ -593,12 +604,31 @@ public class EbookController {
 				ebookservice.updateByPrimaryKeySelective(ebook);
 				// 插入文章及分类关联表
 				ev.getArticleSet().forEach(article -> {
-					article.setAuthor(book.getAuthor());
+					
+					//查询作者库是否有作者，姓名查询没有进行新增
+					AuthorLibraryListVO vo = authorLibraryMapper.queryByName(article.getAuthor());
+					if(vo != null) {
+						//文章作者关联关系
+						RelationAuthor li = new RelationAuthor();    
+						li.setResourceId(article.getId());
+						li.setAuthorId(vo.getId());
+						li.setAuthor(article.getAuthor());
+						bookAuthorMapper.insert(li);
+						//文章作者赋值
+						article.setAuthorId(vo.getId());
+					}else {
+						SaveUpdateAuthorForm entity = new SaveUpdateAuthorForm();
+						entity.setName(article.getAuthor());
+						entity.setSynopsis(article.getAuthorSynopsis());
+						authorLibraryService.saveOrUpdate(entity);
+					}
+					
+//					article.setAuthor(book.getAuthor());
 					article.setBookId(book.getId());
 					article.setBookName(book.getName());
 					article.setUploadTime(new Date());
 					article.setUpdateTime(new Date());
-					article.setStatus(2);	//默认下架
+					article.setStatus(1);	//默认上架
 					article.setBrowseNum(0);
 					article.setResourceType(AllResourceTypeEnum.ARTICLE.getCode());
 					article.setGoodsType(GoodsTypeEnum.ARTICLE.getCode());

app/resource/src/main/java/com/zrqx/resource/bg/mapper/authorLibrary/AuthorLibraryMapper.java

@@ -56,5 +56,15 @@ public interface AuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 			+ "</if>" 
 			+ "</script>") 
 	List<AuthorLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm form);
+	
+	@Select("<script>"
+			+ "select * from res_author_library a  "
+			+ " where 1 = 1 "
+			+ " like(a.name,name)  LIMIT 1"
+			+ "</script>") 
+	AuthorLibraryListVO queryByName(@Param("name")String name);
+	
+	
+	
 
 }

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibrary.java

@@ -25,6 +25,8 @@ public class ArticleLibrary {
 	private String authorId;
 	@ApiModelProperty("作者")
 	private String author;
+	@ApiModelProperty("作者简介")
+	private String authorSynopsis;
 	@ApiModelProperty("来源")
 	private String source;
 	@ApiModelProperty("关键词")