--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/articlelibrary/FgQueryArticleLibraryForm.java

 package com.zrqx.core.form.resource.fg.articlelibrary;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,12 +8,10 @@ import lombok.Data;
 @ApiModel(value="FgQueryArticleLibraryForm",description="文章库")
 public class FgQueryArticleLibraryForm {
 
-	@ApiModelProperty("作者id")
-	private String authorId;
-	@ApiModelProperty(value = "自定义分类code")
-	private List<String> diyTypeCode;
-	@ApiModelProperty(value = "标签内容code")
-	private List<String> labelContentDiyTypeCode;
-	@ApiModelProperty("资源类型 0全部  1图书、2文章、3图片、4视频、5音频、6附件、7医家资源 ")
-	private Integer resourceType;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("年份")
+	private String year;
+	@ApiModelProperty("杂志主体")
+	private String diyTypeCode;
 }

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

@@ -90,10 +90,14 @@ public class Book {
 	private String print;
 	@ApiModelProperty("封面")
 	private String bookCover;
+	@ApiModelProperty("关键词")
+	private String keywords;
 	@ApiModelProperty("判断pdf,资源来自新上传资源（值为1）还是已有资源绑定（值为2）")
 	private Integer pdfResourceType;
 	@ApiModelProperty(value = "创建时间")
 	private Date uploadTime;
 	@ApiModelProperty(value = "修改时间")
 	private Date updateTime;
+	@ApiModelProperty(value = "浏览数量")
+	private Integer browseNum;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/articlelibrary/FgArticleLibraryListVO.java

 package com.zrqx.core.vo.resource.fg.articlelibrary;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
 import java.util.Date;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 /**
  * 前台-文章
@@ -13,7 +11,7 @@ import lombok.Data;
  * @date 2019年1月11日下午4:40:38
  */
 @Data
-@ApiModel(value="FgArticleLibraryListVO",description="查询文章集合返回的实体")
+@ApiModel(value="FgArticleLibraryListVO",description="查询集合返回的实体")
 public class FgArticleLibraryListVO {
 	@ApiModelProperty("文章id，新增时不需要填写")
 	private String id;
@@ -21,52 +19,14 @@ public class FgArticleLibraryListVO {
 	private String name;
 	@ApiModelProperty(value = "简介")
 	private String synopsis;
-	@ApiModelProperty(value = "正文")
-	private String text;
-	@ApiModelProperty("图书id")
-	private String bookId;
-	@ApiModelProperty("所属图书")
-	private String bookName;
-	@ApiModelProperty("定价")
-	private BigDecimal price;
-	@ApiModelProperty("售价")
-	private BigDecimal realPrice;
+	@ApiModelProperty("来源")
+	private String source;
 	@ApiModelProperty("上传时间")
 	private Date uploadTime;
-	@ApiModelProperty("文章封面")
-	private String img;
-	@ApiModelProperty("全文阅读权限 0 游客可见 1会员可见")
-	private Integer readTextPower;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
-	@ApiModelProperty("资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件")
-	private Integer resourceType;
-	@ApiModelProperty("浏览数量")
-	private Integer browseNum;
-	@ApiModelProperty("商品类型，默认2-1")
-	private String goodsType;
-	
-	@ApiModelProperty("折扣")
-	private BigDecimal discount;
-	@ApiModelProperty("0:未购买；1：已购买")
-	private Integer isBuy;
-	@ApiModelProperty("0:未登录；1：已登录")
-	private Integer isLogin;
-	@ApiModelProperty("0:付费；1：免费")
-	private Integer isFree;
-	@ApiModelProperty("0:不是作者；1：是作者")
-	private Integer isAuthor;
-	@ApiModelProperty("0:阅读；1：加入购车；2：加入购物车(置灰)")
-	private Integer isStatus;
-	@ApiModelProperty("提示消息code")
-	private Integer messageCode;
-	@ApiModelProperty("提示消息")
-	private String message;
-	
-	@ApiModelProperty("是否有pdf：0：没有；1：有")
-	private Integer isPdf;
-	@ApiModelProperty("是否有音频：0：没有；1：有")
-	private Integer isAudio;
-	@ApiModelProperty("是否有视频：0：没有；1：有")
-	private Integer isVideo;
+	@ApiModelProperty("封面")
+	private String bookCover;
+	@ApiModelProperty(value = "年份")
+	private String year;
+	@ApiModelProperty("期数")
+	private String periods;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/year/EbookYearListVO.java

+package com.zrqx.core.vo.resource.year;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="YearLibraryListVO",description="查询年份集合返回的实体")
+public class EbookYearListVO {
+	@ApiModelProperty(value = "杂志主体")
+	private List<String> mainBody;
+	@ApiModelProperty(value = "年份")
+	private List<String> name;
+	@ApiModelProperty("期数")
+	private List<String> periods;
+}