--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/controller/ebook/WapEbookController.java

@@ -18,6 +18,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 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.ebook.WapIndexEbookListVO;
 import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryService;
 import com.zrqx.resource.fg.service.ebook.FgEbookService;
@@ -48,6 +49,16 @@ public class WapEbookController {
 	@Autowired
 	private FgEbookService ebookservice;
 
+	
+	@ApiOperation("首页最新上架")
+	@GetMapping(ResourceRequestPath.PAGE)	
+	public CallBack<List<WapIndexEbookListVO>> getBookList(String oid) {
+		List<WapIndexEbookListVO> list = bookservice.queryMainBody(oid);
+		return CallBack.success(list);
+	}
+	
+	
+	
 	@ApiOperation("查询杂志列表")
 	@GetMapping(ResourceRequestPath.PAGE)	
 	public CallBack<List<FgEbookListVO>> getBookList(FgQueryArticleLibraryForm form) {

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/mapper/WapBookMapper.java

@@ -10,6 +10,7 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Book;
 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.WapIndexEbookListVO;
 
 @Mapper
 public interface WapBookMapper extends BaseMapper<Book> {
@@ -49,6 +50,26 @@ public interface WapBookMapper extends BaseMapper<Book> {
 			+ "</if>" 
 			+ "</script>")
 	List<FgArticleLibraryListVO> pageBook(FgQueryArticleLibraryForm form);
+	/**
+	 * 首页查询最新上架杂志
+	 * @param oid
+	 * @return
+	 * @author rjc
+	 * @date: 2019年9月23日 上午11:58:49
+	 */
+	@Select("<script>"
+			+ "select bb.id,bb.name, bb.year, bb.periods, bb.bookCover,bb.status,bb.summary,bb.pdf,"
+			+ "bb.mainBody,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d') uploadTime "
+			+ "FROM res_book bb WHERE bb.status = 1 " 
+			+ "<if test='year != null'>"  
+			+ "and bb.year = #{year} " 
+			+ "</if>" 
+			+ "<if test = 'mainBody != null' >"  
+			+ "and bb.mainBody = #{mainBody} "
+			+ "</if>" 
+			+ " order by bb.uploadTime desc"
+			+ "</script>")
+	List<WapIndexEbookListVO> queryMainBody(String oid);
 	
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/service/WapBookService.java

@@ -8,6 +8,7 @@ import com.zrqx.core.service.BaseService;
 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.WapIndexEbookListVO;
 
 /**
  * 
@@ -18,4 +19,6 @@ public interface WapBookService extends BaseService<Book, String> {
 	List<FgEbookListVO> query(FgQueryArticleLibraryForm form);
 
 	List<FgArticleLibraryListVO> pageBook(FgQueryArticleLibraryForm form, PageParam pageParam);
+
+	List<WapIndexEbookListVO> queryMainBody(String oid);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/service/WapBookServiceImpl.java

@@ -15,6 +15,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 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.WapIndexEbookListVO;
 import com.zrqx.resource.fg.mapper.year.FgYearLibraryMapper;
 import com.zrqx.resource.wap.mapper.WapBookMapper;
 
@@ -57,5 +58,15 @@ public class WapBookServiceImpl extends BaseServiceImpl<Book, String> implements
 		return list;
 	}
 
+	@Override
+	public List<WapIndexEbookListVO> queryMainBody(String oid) {
+		List<WapIndexEbookListVO> list = bookMapper.queryMainBody(oid);
+		for (WapIndexEbookListVO vo : list) {
+			YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(vo.getYear());
+			vo.setName(library.getName()+"年第"+vo.getPeriods()+"期");
+		}
+		return list;
+	}
+
 
 }