--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/resource/ResourceRequestPath.java

@@ -32,6 +32,8 @@ public class ResourceRequestPath extends BaseRequestPath {
 	public static final String RELATION_RESOURCE = "/relation-resource";
 	/** 课程库*/
 	public static final String COURSE_LIBRARY = "/course-library";
+	/** 专题库*/
+	public static final String PROJECT_LIBRARY = "/project-library";
 	/** 标签库*/
 	public static final String LABEL = "/label";
 	/** 自定义分类 **/

com.zrqx.core/src/main/java/com/zrqx/core/enums/AllResourceTypeEnum.java

@@ -12,22 +12,16 @@ import org.apache.commons.lang3.StringUtils;
 public enum AllResourceTypeEnum {
 	//资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件 
 
-	/** pdf */
-	PDF(8, "PDF"),
-	
-	ANNEX(7, "附件"),
-	/** 音频*/
-	AUDIO(6, "音频"),
-	/** 视频 */
-	VIDEO(5, "视频"),
-	/** 图片*/
-	IMAGE(4, "图片"),
-	/** 文章 */
-	ARTICLE(3, "文章"),
-	/** 图书 */
 	BOOK(1, "电子书"),
-	/** 医家 */
-	AUTHOR(2, "医家");
+	AUTHOR(2, "医家"),
+	ARTICLE(3, "文章"),
+	IMAGE(4, "图片"),
+	VIDEO(5, "视频"),
+	AUDIO(6, "音频"),
+	ANNEX(7, "附件"),
+	PROJECT(8, "专题"),
+	COURSE(9, "课程"),
+	PDF(10, "PDF");
 
 	private final Integer code;
 	private final String name;

com.zrqx.core/src/main/java/com/zrqx/core/enums/resource/recommend/RecommendCodeEnum.java

@@ -11,14 +11,16 @@ import org.apache.commons.lang3.StringUtils;
  */
 public enum RecommendCodeEnum {
 
-	/** 首页-推荐资源PC_home01 */
-	CODE_01("HOME_1", "首页-中医讲堂"),
-	/** 首页-推荐文献PC_home02*/
-	CODE_02("HOME_2","首页-中医之声"),
-	/** 首页-快看-研究集成PC_home03*/
-	CODE_03("HOME_3","首页-推荐阅读"),
-	/** 首页-快看-学术活动PC_home04*/
-	CODE_04("HOME_4","首页-推荐图书");
+	CODE_01("XKFL","网站首页-学科分类"),
+	CODE_02("RMTS","网站首页-热门图书"),
+	CODE_03("TJKC","网站首页-推荐课程"),
+	CODE_04("TJZJ","网站首页-推荐章节"),
+	CODE_05("XSTJ","图书首页-新书推荐"),
+	CODE_06("GFLTJTS","图书首页-各分类推荐图书"),
+	CODE_07("ZT1","图书首页-专题1"),
+	CODE_08("ZT1","图书首页-专题2"),
+	CODE_09("RW","图书首页-人物"),
+	CODE_10("RXTS","图书首页-热销图书");
 
 	private final String code;
 	private final String name;

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/coursewarelibrary/BatchUpdateCoursewareLibraryForm.java → com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/courselibrary/BatchUpdateCourseLibraryForm.java

-package com.zrqx.core.form.resource.bg.coursewarelibrary;
+package com.zrqx.core.form.resource.bg.courselibrary;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,16 +7,14 @@ import java.util.List;
 
 import lombok.Data;
 
-import com.zrqx.core.model.resource.coursewarelibrary.CoursewareLibraryDiyType;
+import com.zrqx.core.model.resource.projectlibrary.ProjectLibraryDiyType;
 @Data
-@ApiModel(value="BatchUpdateCoursewareLibraryForm",description="批量修改课件")
-public class BatchUpdateCoursewareLibraryForm {
-	@ApiModelProperty("课件id集合")
-	private List<Integer> ids;
+@ApiModel(value="BatchUpdateCourseLibraryForm",description="批量修改课程")
+public class BatchUpdateCourseLibraryForm {
+	@ApiModelProperty("课程id集合")
+	private List<String> ids;
 	@ApiModelProperty(value = "状态：1已上架，2已下架")
 	private Integer status;
 	@ApiModelProperty(value = "分类id")
-	private List<CoursewareLibraryDiyType> diyType;
-	@ApiModelProperty("定价")
-	private String price;
+	private List<ProjectLibraryDiyType> diyType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/coursewarelibrary/QueryCoursewareLibraryForm.java → com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/courselibrary/QueryCourseLibraryForm.java

-package com.zrqx.core.form.resource.bg.coursewarelibrary;
-
-import java.util.List;
+package com.zrqx.core.form.resource.bg.courselibrary;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
 import lombok.Data;
 @Data
-@ApiModel(value="QueryCoursewareLibraryForm",description="课件库")
-public class QueryCoursewareLibraryForm {
-	@ApiModelProperty(value = "课件名称")
+@ApiModel(value="QueryCourseLibraryForm",description="课程库")
+public class QueryCourseLibraryForm {
+	@ApiModelProperty(value = "资源名称")
 	private String name;
-	@ApiModelProperty("作者")
-	private String author;
 	@ApiModelProperty("来源")
 	private String source;
 	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
@@ -24,6 +23,4 @@ public class QueryCoursewareLibraryForm {
 	private List<Integer> diyTypeId;
 	@ApiModelProperty("自定义分类code")
 	private String diyTypeCode;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/courselibrary/SaveUpdateCourseLibraryForm.java

+package com.zrqx.core.form.resource.bg.courselibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+import com.zrqx.core.model.resource.courcelibrary.CourseLibraryDiyType;
+import com.zrqx.core.model.resource.courcelibrary.CourseLibraryLabelContentDiyType;
+@Data
+@ApiModel(value="SaveUpdateCourseLibraryForm",description="添加课程库")
+public class SaveUpdateCourseLibraryForm {
+	@ApiModelProperty("课程id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("资源名称")
+	private String name;
+	@ApiModelProperty("讲师")
+	private String author;
+	@ApiModelProperty("讲师id")
+	private String authorId;
+	@ApiModelProperty(value = "讲师名称和id（用,隔开）")
+	private String authorNameAndId;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("简介")
+	private String synopsis;
+	@ApiModelProperty("定价 元")
+	private BigDecimal price;
+	@ApiModelProperty("售价 元")
+	private BigDecimal realPrice;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private Integer status;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	@ApiModelProperty("更新时间")
+	private Date updateTime;
+	@ApiModelProperty("播放次数")
+	private Integer clickNum;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+	@ApiModelProperty(value = "分类id")
+	private List<CourseLibraryDiyType> diyType;
+	@ApiModelProperty(value = "标签id")
+	private List<CourseLibraryLabelContentDiyType> label;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/coursewarelibrary/SaveCoursewareLibraryForm.java

-package com.zrqx.core.form.resource.bg.coursewarelibrary;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import lombok.Data;
-
-import com.zrqx.core.model.resource.coursewarelibrary.CoursewareLibraryDiyType;
-@Data
-@ApiModel(value="SaveCoursewareLibraryForm",description="添加课件库")
-public class SaveCoursewareLibraryForm {
-	@ApiModelProperty(value = "课件名称集合")
-	private List<String> names;
-	@ApiModelProperty("来源")
-	private String source;
-	@ApiModelProperty("关键词")
-	private String keywords;
-	@ApiModelProperty("定价")
-	private BigDecimal price;
-	@ApiModelProperty("coursewares")
-	private List<String> coursewares;
-	@ApiModelProperty(value = "分类id")
-	private CoursewareLibraryDiyType diyType;
-}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/coursewarelibrary/SaveUpdateCoursewareLibraryForm.java

-package com.zrqx.core.form.resource.bg.coursewarelibrary;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import lombok.Data;
-
-import com.zrqx.core.model.resource.coursewarelibrary.CoursewareLibraryDiyType;
-@Data
-@ApiModel(value="SaveUpdateCoursewareLibraryForm",description="添加或修改课件库")
-public class SaveUpdateCoursewareLibraryForm {
-	@ApiModelProperty("课件id，新增时不需要填写")
-	private Integer id;
-	@ApiModelProperty(value = "课件名称")
-	private String name;
-	@ApiModelProperty("来源")
-	private String source;
-	@ApiModelProperty("关键词")
-	private String keywords;
-	@ApiModelProperty("定价")
-	private BigDecimal price;
-	@ApiModelProperty("courseware")
-	private String courseware;
-	@ApiModelProperty(value = "分类id")
-	private List<CoursewareLibraryDiyType> diyType;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
-}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/projectlibrary/BatchUpdateProjectLibraryForm.java

+package com.zrqx.core.form.resource.bg.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import lombok.Data;
+
+import com.zrqx.core.model.resource.projectlibrary.ProjectLibraryDiyType;
+@Data
+@ApiModel(value="BatchUpdateProjectLibraryForm",description="批量修改专题")
+public class BatchUpdateProjectLibraryForm {
+	@ApiModelProperty("专题id集合")
+	private List<String> ids;
+	@ApiModelProperty(value = "状态：1已上架，2已下架")
+	private Integer status;
+	@ApiModelProperty(value = "分类id")
+	private List<ProjectLibraryDiyType> diyType;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/projectlibrary/QueryProjectLibraryForm.java

+package com.zrqx.core.form.resource.bg.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import lombok.Data;
+@Data
+@ApiModel(value="QueryProjectLibraryForm",description="专题库")
+public class QueryProjectLibraryForm {
+	@ApiModelProperty(value = "资源名称")
+	private String name;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private String status;
+	@ApiModelProperty(value="上传时间-开始")
+	private String beginTime;
+	@ApiModelProperty(value="上传时间-结束")
+	private String endTime;
+	@ApiModelProperty(value = "自定义分类id")
+	private List<Integer> diyTypeId;
+	@ApiModelProperty("自定义分类code")
+	private String diyTypeCode;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/projectlibrary/SaveUpdateProjectLibraryForm.java

+package com.zrqx.core.form.resource.bg.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+
+import org.springframework.format.annotation.DateTimeFormat;
+@Data
+@ApiModel(value="SaveUpdateProjectLibraryForm",description="添加专题库")
+public class SaveUpdateProjectLibraryForm {
+	@ApiModelProperty("专题id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("专题名称")
+	private String name;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("状态 0下线，1上线")
+	private Integer status;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty(value = "作者名称和id（用,隔开）")
+	private String authorNameAndId;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/recommend/SaveRecommendForm.java

@@ -23,8 +23,6 @@ public class SaveRecommendForm {
 	private String descriptions;
 	@ApiModelProperty("状态：0禁用，1启用")
 	private Integer status;
-	@ApiModelProperty(value = "民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
 	@ApiModelProperty(value = "推荐位类型：1首页推荐位  ")
 	private Integer recommendType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/ebook/FgQueryRecommedEbookForm.java

@@ -10,8 +10,6 @@ import lombok.Data;
 public class FgQueryRecommedEbookForm {
 	@ApiModelProperty(value = "电子书id")
 	private List<String> ids;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
 	@ApiModelProperty("数据量")
 	private Integer num;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/recommend/FgQueryRecommedResourceForm.java

+package com.zrqx.core.form.resource.fg.recommend;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import lombok.Data;
+@Data
+@ApiModel(value="FgQueryEbookForm",description="资源推荐")
+public class FgQueryRecommedResourceForm {
+	@ApiModelProperty(value = "资源id")
+	private List<String> ids;
+	@ApiModelProperty("数据量")
+	private Integer num;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/recommend/FgQueryRecommendForm.java

@@ -10,6 +10,4 @@ public class FgQueryRecommendForm {
 	private String code;
 	@ApiModelProperty(value="数量")
 	private Integer num;
-	/*@ApiModelProperty("资源类型 0全部1理论 2药物 3方剂 4临床 5医案 6文化 7机构 8医论 9其他 10医著 11医家 注：1-9与文章类型一致")
-	private Integer resType;*/
 }
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/courcelibrary/CourseLibrary.java

+package com.zrqx.core.model.resource.courcelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+@Data
+@ApiModel(value="CourseLibrary",description="微课库")
+@Table(name = "res_course_library")
+public class CourseLibrary {
+	@Id
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	@ApiModelProperty("课程id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("资源名称")
+	private String name;
+	@ApiModelProperty("讲师")
+	private String author;
+	@ApiModelProperty("讲师id")
+	private String authorId;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("简介")
+	private String synopsis;
+	@ApiModelProperty("定价 元")
+	private BigDecimal price;
+	@ApiModelProperty("售价 元")
+	private BigDecimal realPrice;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private Integer status;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	@ApiModelProperty("更新时间")
+	private Date updateTime;
+	@ApiModelProperty("播放次数")
+	private Integer clickNum;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+	@ApiModelProperty("浏览数量")
+	private Integer salesNum;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/courcelibrary/CourseLibraryDiyType.java

+package com.zrqx.core.model.resource.courcelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Data
+@ApiModel(value="CourseLibraryDiyType",description="课程与自定义分类关系表")
+@Table(name = "res_course_Library_Diy_Type")
+public class CourseLibraryDiyType {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("课程与自定义分类关系表id")
+	private Integer id;
+	@ApiModelProperty("课程库id")
+	private String courseLibraryId;
+	@ApiModelProperty("自定义分类id")
+	private Integer diyTypeId;
+	@ApiModelProperty("自定义分类code")
+	private String code;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/courcelibrary/CourseLibraryLabelContentDiyType.java

+package com.zrqx.core.model.resource.courcelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Data
+@ApiModel(value="CourseLibraryLabelContentDiyType",description="课程与标签关系表")
+@Table(name = "res_Course_Library_Label_Content_Diy_Type")
+public class CourseLibraryLabelContentDiyType {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("课程与标签内容关系表id")
+	private Integer id;
+	@ApiModelProperty("课程id")
+	private String courseLibraryId;
+	@ApiModelProperty(value = "标签id")
+	private Integer labelId;
+	@ApiModelProperty(value = "标签内容id")
+	private Integer labelContentId;
+	@ApiModelProperty(value = "标签内容code")
+	private String labelContentCode;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/projectlibrary/ProjectLibrary.java

+package com.zrqx.core.model.resource.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@ApiModel(value="ProjectLibrary",description="专题库")
+@Table(name = "res_project_library")
+public class ProjectLibrary {
+
+	@Id
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	@ApiModelProperty("专题id，新增时不需要填写")
+	private String id;
+	
+	@ApiModelProperty("专题名称")
+	private String name;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("状态 0下线，1上线")
+	private Integer status;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	private Date uploadTime;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/projectlibrary/ProjectLibraryDiyType.java

+package com.zrqx.core.model.resource.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Data
+@ApiModel(value="ProjectLibraryDiyType",description="专题与自定义分类关系表")
+@Table(name = "res_project_Library_Diy_Type")
+public class ProjectLibraryDiyType {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("专题与自定义分类关系表id")
+	private Integer id;
+	@ApiModelProperty("专题库id")
+	private String projectLibraryId;
+	@ApiModelProperty("自定义分类id")
+	private Integer diyTypeId;
+	@ApiModelProperty("自定义分类code")
+	private String code;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/projectlibrary/ProjectLibraryLabelContentDiyType.java

+package com.zrqx.core.model.resource.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Data
+@ApiModel(value="ProjectLibraryLabelContentDiyType",description="专题与标签关系表")
+@Table(name = "res_Course_Library_Label_Content_Diy_Type")
+public class ProjectLibraryLabelContentDiyType {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("专题与标签内容关系表id")
+	private Integer id;
+	@ApiModelProperty("专题id")
+	private String projectLibraryId;
+	@ApiModelProperty(value = "标签id")
+	private Integer labelId;
+	@ApiModelProperty(value = "标签内容id")
+	private Integer labelContentId;
+	@ApiModelProperty(value = "标签内容code")
+	private String labelContentCode;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/recommend/Recommend.java

@@ -41,7 +41,4 @@ public class Recommend {
 	@ApiModelProperty(value = "推荐位类型：1公共推荐位  2民族推荐位  3民族主页推荐位")
 	private Integer recommendType;
 	
-	@Transient
-	@ApiModelProperty("民族名称")
-	private String nationsName;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/courselibrary/CourseLibraryListVO.java

 package com.zrqx.core.vo.resource.courselibrary;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -14,39 +15,35 @@ import lombok.Data;
 public class CourseLibraryListVO {
 
 	@ApiModelProperty("课程id，新增时不需要填写")
-	private Integer id;
-	@ApiModelProperty(value = "课程名称", required = true)
-	private String courseName;
-	@ApiModelProperty("更新期数")
-	private Integer updatePeriods;
-	@ApiModelProperty("总期数")
-	private Integer totalPeriods;
-	@ApiModelProperty("订阅量")
-	private Integer subscriptionNum;
-	@ApiModelProperty("售价")
-	private Double price;
+	private String id;
+	@ApiModelProperty("资源名称")
+	private String name;
+	@ApiModelProperty("讲师")
+	private String author;
+	@ApiModelProperty("讲师id")
+	private String authorId;
+	@ApiModelProperty("来源")
+	private String source;
 	@ApiModelProperty("封面")
 	private String cover;
-	@ApiModelProperty("关键词")
-	private String keywords;
+	@ApiModelProperty("简介")
+	private String synopsis;
+	@ApiModelProperty("定价 元")
+	private BigDecimal price;
+	@ApiModelProperty("售价 元")
+	private BigDecimal realPrice;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private Integer status;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private String status_zh;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
 	@ApiModelProperty("更新时间")
 	private Date updateTime;
-	@ApiModelProperty("创建时间")
-	private Date createTime;
-	@ApiModelProperty("状态：0已录入，1已上架，2已下架")
-	private Integer status;
-	@ApiModelProperty("作者")
-	private String author;
-	@ApiModelProperty("课程简介")
-	private String synopsis;
-	@ApiModelProperty("划线价格")
-	private Double linePrice;
-	@ApiModelProperty("课程详情")
-	private String detail;
-	@ApiModelProperty("点击数")
+	@ApiModelProperty("播放次数")
 	private Integer clickNum;
-	@ApiModelProperty("课程数")
-	private Integer videoNum;
-	@ApiModelProperty("视频列表")
-	private List<VideoLibrary>videoList;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/courselibrary/CourseLibraryVO.java

+package com.zrqx.core.vo.resource.courselibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.zrqx.core.model.resource.courcelibrary.CourseLibraryDiyType;
+import com.zrqx.core.model.resource.courcelibrary.CourseLibraryLabelContentDiyType;
+@Data
+@ApiModel(value="CourseLibraryVO",description="单个查询课程返回的实体")
+public class CourseLibraryVO {
+	@ApiModelProperty("课程id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("课程名称")
+	private String name;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("课程简介")
+	private String synopsis;
+	@ApiModelProperty("状态 0下线，1上线")
+	private Integer status;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty(value = "作者名称和id（用,隔开）")
+	private String authorNameAndId;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+	@ApiModelProperty(value = "分类id")
+	private List<CourseLibraryDiyType> diyType;
+	@ApiModelProperty(value = "标签id")
+	private List<CourseLibraryLabelContentDiyType> label;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/authorlibrary/AboutEbookListVO.java

+package com.zrqx.core.vo.resource.fg.authorlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import lombok.Data;
+
+import com.zrqx.core.model.resource.authorLibrary.AuthorLibraryDiytype;
+@Data
+@ApiModel(value="AboutEbookListVO",description="查询推荐返回的实体")
+public class AboutEbookListVO {
+	@ApiModelProperty("资源id")
+	private String id;
+	@ApiModelProperty("图书类型")
+	private Integer type;
+	@ApiModelProperty("资源名称")
+	private String name;
+	@ApiModelProperty("电子书封面")
+	private String bookCover;
+	@ApiModelProperty("内容简介")
+	private String summary;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/authorlibrary/FgAuthorListVO.java

+package com.zrqx.core.vo.resource.fg.authorlibrary;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import lombok.Data;
+/**
+ * 前台-作者列表
+ * @author ycw
+ * @date 2019年1月11日下午4:40:06
+ */
+@Data
+@ApiModel(value="FgAuthorLibraryListVO",description="查询作者返回的实体")
+public class FgAuthorListVO {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("作者ID")
+	private String id;
+	@ApiModelProperty("姓名")
+	private String name;
+	@ApiModelProperty("简介")
+	private String description;
+	@ApiModelProperty("头像")
+	private String faceImg;
+	@ApiModelProperty("相关图书资源")
+	List<AboutEbookListVO> aboutEbookListVO;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/courselibrary/FgCourseLibraryListVO.java

+package com.zrqx.core.vo.resource.fg.courselibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+/**
+ * 前台-专题
+ * @author ycw
+ * @date 2019年1月11日下午4:40:38
+ */
+@Data
+@ApiModel(value="FgCourseLibraryListVO",description="查询课程集合返回的实体")
+public class FgCourseLibraryListVO {
+	@ApiModelProperty("专题id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty(value = "课程名称")
+	private String name;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+	@ApiModelProperty("资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件")
+	private Integer resourceType;
+	@ApiModelProperty("简介")
+	private String synopsis;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/courselibrary/FgCourseLibraryVO.java

+package com.zrqx.core.vo.resource.fg.courselibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 前台-专题库vo
+ * @author ycw
+ * @date 2019年1月11日下午4:39:39
+ */
+@Data
+@ApiModel(value = "FgProjectLibraryVO",description = "专题资源")
+public class FgCourseLibraryVO {
+
+	@ApiModelProperty("专题id")
+	private String id;
+	@ApiModelProperty("专题名称")
+	private String name;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty(value = "作者名称和id（用,隔开）")
+	private String authorNameAndId;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/projectlibrary/FgProjectLibraryListVO.java

+package com.zrqx.core.vo.resource.fg.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+/**
+ * 前台-专题
+ * @author ycw
+ * @date 2019年1月11日下午4:40:38
+ */
+@Data
+@ApiModel(value="FgProjectLibraryListVO",description="查询专题集合返回的实体")
+public class FgProjectLibraryListVO {
+	private String id;
+	@ApiModelProperty("资源名称")
+	private String name;
+	@ApiModelProperty("讲师")
+	private String author;
+	@ApiModelProperty("讲师id")
+	private String authorId;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("简介")
+	private String synopsis;
+	@ApiModelProperty("定价 元")
+	private BigDecimal price;
+	@ApiModelProperty("售价 元")
+	private BigDecimal realPrice;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private Integer status;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	@ApiModelProperty("更新时间")
+	private Date updateTime;
+	@ApiModelProperty("播放次数")
+	private Integer clickNum;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/projectlibrary/FgProjectLibraryVO.java

+package com.zrqx.core.vo.resource.fg.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 前台-专题库vo
+ * @author ycw
+ * @date 2019年1月11日下午4:39:39
+ */
+@Data
+@ApiModel(value = "FgProjectLibraryVO",description = "专题资源")
+public class FgProjectLibraryVO {
+
+	@ApiModelProperty("专题id")
+	private String id;
+	@ApiModelProperty("专题名称")
+	private String name;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty(value = "作者名称和id（用,隔开）")
+	private String authorNameAndId;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/recommend/FgRecommendListVo.java

@@ -23,8 +23,6 @@ public class FgRecommendListVo  {
 	private String name;
 	@ApiModelProperty("推荐位封面")
 	private String img;
-	@ApiModelProperty(value = "民族")
-	private Integer nationsType;
 	@ApiModelProperty(value = "推荐内容(列表)")
 	private List<?> RecommendResourceList;
 	@ApiModelProperty(value = "推荐内容(分页)")

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/projectlibrary/ProjectLibraryListVO.java

+package com.zrqx.core.vo.resource.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="ProjectLibraryListVO",description="查询专题集合返回的实体")
+public class ProjectLibraryListVO {
+	@ApiModelProperty("专题id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty(value = "资源名称")
+	private String name;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("上传时间")
+	private String uploadTime;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private Integer status;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private String status_zh;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("封面图片")
+	private String cover;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/projectlibrary/ProjectLibraryVO.java

+package com.zrqx.core.vo.resource.projectlibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+
+import org.springframework.format.annotation.DateTimeFormat;
+@Data
+@ApiModel(value="ProjectLibraryVO",description="单个查询专题返回的实体")
+public class ProjectLibraryVO {
+	@ApiModelProperty("专题id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("专题名称")
+	private String name;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private Integer status;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty(value = "作者名称和id（用,隔开）")
+	private String authorNameAndId;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+}