--no commit message

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

@@ -10,12 +10,13 @@ import org.apache.commons.lang3.StringUtils;
  * @date 
  */
 public enum AllResourceTypeEnum {
-	//资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件 
+	//资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件 8专题
 
 	/** pdf */
 	PDF(3, "PDF"),
 	VIDEO(5, "视频"),
 	AUDIO(6, "音频"),
+	PROJECT(8, "专题"),
 /*	ANNEX(7, "附件"),
 	*//** 音频*//*
 	AUDIO(6, "音频"),

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

+package com.zrqx.core.form.resource.bg.projectlibrary;
+
+import java.util.List;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="BatchUpdateProjectLibraryForm",description="批量修改专题")
+public class BatchUpdateProjectLibraryForm {
+	@ApiModelProperty("专题id集合")
+	private List<String> ids;
+	@ApiModelProperty("状态 0禁用，1启用")
+	private Integer status;
+	
+}

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("名称 作者")
+	private String nai;
+	@ApiModelProperty(value = "资源名称")
+	private String name;
+	@ApiModelProperty("状态 0禁用，1启用")
+	private Integer status;
+	@ApiModelProperty("状态 0 杂志 1微首页")
+	private Integer sceneStatus;
+	@ApiModelProperty("状态 0 推荐 1 置顶")
+	private Integer topStatus;
+	@ApiModelProperty(value="上传时间-开始")
+	private String beginTime;
+	@ApiModelProperty(value="上传时间-结束")
+	private String endTime;
+}

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 lombok.Data;
+@Data
+@ApiModel(value="SaveUpdateProjectLibraryForm",description="添加专题库")
+public class SaveUpdateProjectLibraryForm {
+	@ApiModelProperty("专题id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("专题名称")
+	private String name;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("封面")
+	private String cover1;
+	@ApiModelProperty("背景图")
+	private String backcover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("状态 0禁用，1启用")
+	private Integer status;
+	@ApiModelProperty("状态 0 杂志 1微首页")
+	private Integer sceneStatus;
+	@ApiModelProperty("状态 0 推荐 1 置顶")
+	private Integer topStatus;
+	
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+
+}

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

+package com.zrqx.core.model.resource.rojectLibrary;
+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("封面1")
+	private String cover;
+	@ApiModelProperty("封面2")
+	private String cover1;
+	@ApiModelProperty("背景图")
+	private String backcover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("状态 0禁用，1启用")
+	private Integer status;
+	@ApiModelProperty("状态 0 杂志 1微首页")
+	private Integer sceneStatus;
+	@ApiModelProperty("状态 0 推荐 1 置顶")
+	private Integer topStatus;
+	@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("浏览数量")
+	private Integer browseNum;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+
+}

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 java.util.Date;
+
+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 Date uploadTime;
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+	@ApiModelProperty("状态 0禁用，1启用")
+	private Integer status;
+	@ApiModelProperty("状态 0 杂志 1微首页")
+	private Integer sceneStatus;
+	@ApiModelProperty("状态 0 推荐 1 置顶")
+	private Integer topStatus;
+	@ApiModelProperty("封面图片")
+	private String cover;
+	@ApiModelProperty("封面图片")
+	private String cover1;
+
+}

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 cover1;
+	@ApiModelProperty("背景图")
+	private String backcover;
+	@ApiModelProperty("专题简介")
+	private String synopsis;
+	@ApiModelProperty("状态 0禁用，1启用")
+	private Integer status;
+	@ApiModelProperty("状态 0 杂志 1微首页")
+	private Integer sceneStatus;
+	@ApiModelProperty("状态 0 推荐 1 置顶")
+	private Integer topStatus;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+}