--no commit message

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

 package com.zrqx.resource.bg.controller.ebook;
 
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,9 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.ebook.EbookMainBodyListVO;
 import com.zrqx.core.vo.resource.ebook.EbookMainBodyVO;
+import com.zrqx.core.vo.resource.year.EbookYearListVO;
 import com.zrqx.resource.bg.service.ebook.EbookMainBodyService;
+import com.zrqx.resource.bg.service.year.YearLibraryService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +37,9 @@ import tk.mybatis.mapper.entity.Example;
 public class EbookMainBodyController {
 	@Autowired
 	private EbookMainBodyService ebookMainBodyService;
+	@Autowired
+	private YearLibraryService yearLibraryService;
+	
 	
 	@ApiOperation("保存杂志主体")
 	@PostMapping(ResourceRequestPath.SAVE)
@@ -92,10 +98,18 @@ public class EbookMainBodyController {
 		ebookMainBodyService.UpdateByExampleSelective(b,example);
 		return CallBack.success();
 	}
-	@ApiOperation("查询所有杂志主体")
+	/*@ApiOperation("查询所有杂志主体")
 	@GetMapping(ResourceRequestPath.SELECT_ALL)
-	public CallBack<List<EbookMainBody>> getBookList() {
+	public CallBack<List<EbookYearListVO>> getBookList() {
+		List<String> mainBody = new ArrayList<String>();
+		EbookYearListVO vo = new EbookYearListVO();
+		List<EbookMainBody> list = ebookMainBodyService.queryByEbookMianBodyAll();
+		for (EbookMainBody bo : list) {
+			
+			yearLibraryService.queryById(bo.getPeriodsNumber());
 			
-		return CallBack.success(ebookMainBodyService.selectAll());
 		}
+		vo.setMainBody(list);
+		return CallBack.success();
+	}*/
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMainBodyMapper.java

@@ -8,6 +8,7 @@ import com.zrqx.core.form.resource.bg.ebook.QueryEbookMainBodyForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.EbookMainBody;
 import com.zrqx.core.vo.resource.ebook.EbookMainBodyListVO;
+import com.zrqx.core.vo.resource.year.EbookYearListVO;
 
 /**
  * 杂志主体
@@ -30,5 +31,9 @@ public interface EbookMainBodyMapper extends BaseMapper<EbookMainBody>{
 		    + " order by bb.uploadTime desc "
 			+ "</script>")
 	List<EbookMainBodyListVO> page(QueryEbookMainBodyForm form);
+	@Select("<script>"
+			+ "SELECT * FROM res_ebook_main_body WHERE 1 = 1  and status=1 order by uploadTime desc "
+			+ "</script>")
+	List<EbookMainBody> queryByEbookMianBodyAll();
 
 }

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

@@ -10,7 +10,6 @@ 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.resource.ebook.EbookMainBodyListVO;
-import com.zrqx.core.vo.resource.year.EbookYearListVO;
 
 /**
  * 杂志主体

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/articlelibrary/FgArticleLibraryController.java

@@ -64,7 +64,6 @@ public class FgArticleLibraryController {
 	@Autowired
 	private FgChapterLibraryService clservice;
 	
-	
 	/** 浏览记录*/
 	@Autowired
 	private FgRecordService recordService;

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

@@ -25,7 +25,7 @@ import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.enums.resource.EbookPromptMessageEnum;
 import com.zrqx.core.exception.ParameterValidateException;
-import com.zrqx.core.form.resource.fg.ebook.FgQueryEbookInfoForm;
+import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.core.form.sysuser.fg.comment.FgQueryCommentForm;
 import com.zrqx.core.model.resource.articlelibrary.ChapterLibrary;
 import com.zrqx.core.model.resource.ebook.Book;
@@ -34,6 +34,7 @@ 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.util.response.CallBack;
+import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookVO;
@@ -81,12 +82,12 @@ public class FgEbookController {
 
 	@ApiOperation("查询电子书列表")
 	@GetMapping(ResourceRequestPath.PAGE)
-	public CallBack<PageInfo<FgEbookListVO>> getBookList(FgQueryEbookInfoForm form, PageParam pageParam) {
+	public CallBack<PageInfo<FgArticleLibraryListVO>> getBookList(FgQueryArticleLibraryForm form, PageParam pageParam) {
 		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
 			pageParam.setOrderBy("uploadTime desc,id desc");
 		}
-		List<FgEbookListVO> list = ebookservice.page(form, pageParam);
-		return CallBack.success(new PageInfo<FgEbookListVO>(list));
+		List<FgArticleLibraryListVO> list = ebookservice.page(form, pageParam);
+		return CallBack.success(new PageInfo<FgArticleLibraryListVO>(list));
 	}
 	
 	@ApiOperation("根据id查找电子书")
@@ -108,16 +109,6 @@ public class FgEbookController {
 		// 更新浏览量
 		ebookservice.updateBrowseNum(oid);
 		vo.setResourceTypeName(AllResourceTypeEnum.BOOK.getName());
-		//获取评分与评论数
-		FgQueryCommentForm fgQueryCommentForm = new FgQueryCommentForm();
-		fgQueryCommentForm.setResourceId(oid);
-		fgQueryCommentForm.setResourceType(AllResourceTypeEnum.BOOK.getCode());
-		FgCommentNumAndScoreVo fgCommentNumAndScoreVo = sysuserClient.getCommentNumAndScore(fgQueryCommentForm).getData();
-		if(fgCommentNumAndScoreVo != null){
-			vo.setCommentNum(fgCommentNumAndScoreVo.getCommentNum());
-			vo.setResourceScore(fgCommentNumAndScoreVo.getResourceScore());	
-		}
-		// System.out.println(vo.getPrice().toString());
 		return CallBack.success(vo);
 	}
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java

@@ -111,7 +111,6 @@ public class FgResourceLibraryController {
 		if(ArticleTypeEnum.getName(form.getResourceType().toString()) != null){
 			FgQueryArticleLibraryForm entity = new FgQueryArticleLibraryForm();
 			BeanUtils.copyProperties(form, entity);
-			entity.setResourceType(form.getResourceType());
 			List<FgArticleLibraryListVO> list = articleLibraryService.page(entity, pageParam);
 			return CallBack.success(new PageInfo<FgArticleLibraryListVO>(list));
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryMapper.java

@@ -101,30 +101,11 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.id,a.name,a.authorId,a.author,a.source,a.keywords,a.synopsis,a.bookId,"
-			+ "a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,"
-			+ "a.img,a.readTextPower,a.nationsType,a.resourceType,a.browseNum,a.goodsType "
-			+ "from res_Article_Library a "
-			+ "left join res_Article_Library_Diy_Type ad on a.id = ad.alid "
-			+ "left join res_article_library_label_content_diy_type al on a.id = al.alId "
+			+ "select distinct a.id,a.name,a.source,a.keywords,a.synopsis,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,"
+			+ " from res_Article_Library a "
 			+ "where 1=1 and a.status = 1 "
-			+ "<if test = 'form.resourceType != null' >"  
-		    + "and a.resourceType = #{form.resourceType} "
-		    + "</if>" 
-		    + "<if test = 'form.authorId != null' >"  
-		    + "and a.authorId = #{form.authorId} "
-		    + "</if>" 
-		    + "<if test='form.diyTypeCode != null and form.diyTypeCode.size > 0'>"  
-			+ "and ad.code like "
-			+ " <foreach collection=\"form.diyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">" 
-			+ " concat(#{code},'%') " 
-			+ "</foreach>" 
-			+ "</if>" 
-			+ "<if test='form.labelContentDiyTypeCode != null and form.labelContentDiyTypeCode.size > 0'>"  
-			+ "and al.labelContentDiyTypeCode like "
-			+ " <foreach collection=\"form.labelContentDiyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">" 
-			+ " concat(#{code},'%') " 
-			+ "</foreach>" 
+			+ "<if test = 'form.keywords != null' >"  
+		    + "and (a.name like concat('%',#{form.keywords},'%') or a.keywords like concat('%',#{form.keywords},'%')"
 		    + "</if>"
 		    + "</script>")
 	List<FgArticleLibraryListVO> query(@Param("form")FgQueryArticleLibraryForm form);

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java

@@ -6,11 +6,13 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.core.form.resource.fg.ebook.FgQueryEbookInfoForm;
 import com.zrqx.core.form.resource.fg.ebook.FgQueryOtherEbookForm;
 import com.zrqx.core.form.resource.fg.ebook.FgQueryRecommedEbookForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Ebook;
+import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 
 /**
@@ -124,9 +126,9 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date: 2019年1月11日 下午3:50:49
 	 */
 	@Select("<script>"
-			+ "select bb.id, bb.year, bb.periods, bb.bookCover,bb.status,bb.mainBody,bb.year "
+			+ "select bb.id, bb.year, bb.periods, bb.bookCover,bb.status,bb.mainBody,bb.year,"
+			+ "bb.summary as synopsis,bb.source,bb.keywords,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d') uploadTime, "
 			+ "FROM res_book bb WHERE bb.status = 1 " 
-			
 			+ "<if test='year != null and year.size > 0'>"  
 			+ "and bb.year in "
 			+ " <foreach collection=\"year\" index=\"index\" item=\"year\" open=\"(\" separator=\",\" close=\")\">" 
@@ -136,8 +138,11 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 			+ "<if test = 'mainBody != null' >"  
 			+ "and bb.mainBody = #{mainBody} "
 			+ "</if>" 
+			+ "<if test = 'keywords != null' >"  
+			+ "and (a.name like concat('%',#{form.keywords},'%') or a.keywords like concat('%',#{form.keywords},'%')"
+			+ "</if>" 
 			+ "</script>")
-	List<FgEbookListVO> page(FgQueryEbookInfoForm form);
+	List<FgArticleLibraryListVO> page(FgQueryArticleLibraryForm form);
 	
 	/**
 	 * 同类图书排行

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java

@@ -152,17 +152,6 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 	public List<FgArticleLibraryListVO> page(FgQueryArticleLibraryForm form, PageParam pageParam){
 		startPage(pageParam);
 		List<FgArticleLibraryListVO> list = mapper.query(form);
-		// 调用
-		list.forEach(li ->{
-			FgArticleLibraryOneVO one = articleOneInfoById(li.getId(),true);
-			BeanUtils.copyProperties(one, li);
-			ArticleLibrary article = mapper.selectByPrimaryKey(li.getId());
-			if(article != null){
-				li.setIsPdf(article.getPdf() == null ? Integer.parseInt(BooleanStatusEnum.NO.getCode()) : Integer.parseInt(BooleanStatusEnum.YES.getCode()));
-				li.setIsAudio(article.getAudio() == null ? Integer.parseInt(BooleanStatusEnum.NO.getCode()) : Integer.parseInt(BooleanStatusEnum.YES.getCode()));
-				li.setIsVideo(article.getVideo() == null ? Integer.parseInt(BooleanStatusEnum.NO.getCode()) : Integer.parseInt(BooleanStatusEnum.YES.getCode()));
-			}
-		});
 		regEx(list);
 		return list;
 	}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookService.java

@@ -4,13 +4,14 @@ import java.util.List;
 
 import org.apache.solr.common.SolrDocument;
 
-import com.zrqx.core.form.resource.fg.ebook.FgQueryEbookInfoForm;
+import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.core.form.resource.fg.ebook.FgQueryOtherEbookForm;
 import com.zrqx.core.form.resource.fg.ebook.FgQueryRecommedEbookForm;
 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.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookVO;
 
@@ -63,7 +64,7 @@ public interface FgEbookService extends BaseService<Ebook, String>{
 	 * @author ycw
 	 * @date: 2019年1月11日 下午3:39:05
 	 */
-	List<FgEbookListVO> page(FgQueryEbookInfoForm form, PageParam pageParam);
+	List<FgArticleLibraryListVO> page(FgQueryArticleLibraryForm form, PageParam pageParam);
 	
 	/**
 	 * 根据ID查询

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java

@@ -20,7 +20,7 @@ import com.zrqx.core.enums.resource.ReadOrShoppingCartTypeEnum;
 import com.zrqx.core.enums.resource.article.ArticlePromptMessageEnum;
 import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.GoodsForm;
-import com.zrqx.core.form.resource.fg.ebook.FgQueryEbookInfoForm;
+import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.core.form.resource.fg.ebook.FgQueryOtherEbookForm;
 import com.zrqx.core.form.resource.fg.ebook.FgQueryRecommedEbookForm;
 import com.zrqx.core.mapper.BaseMapper;
@@ -33,6 +33,7 @@ import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookVO;
 import com.zrqx.core.vo.resource.fg.videolibrary.FgVideoLibraryListVO;
@@ -145,10 +146,10 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 	}
 	
 	@Override
-	public List<FgEbookListVO> page(FgQueryEbookInfoForm form, PageParam pageParam){
+	public List<FgArticleLibraryListVO> page(FgQueryArticleLibraryForm form, PageParam pageParam){
 		startPage(pageParam);
-		List<FgEbookListVO> list = ebookMapper.page(form);
-		for (FgEbookListVO vo : list) {
+		List<FgArticleLibraryListVO> list = ebookMapper.page(form);
+		for (FgArticleLibraryListVO vo : list) {
 			vo.setName(vo.getYear()+"年第"+vo.getPeriods()+"期");
 		}
 		return list;