--no commit message

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

@@ -12,7 +12,7 @@ import lombok.Data;
 public class BatchUpdateProjectLibraryForm {
 	@ApiModelProperty("专题id集合")
 	private List<String> ids;
-	@ApiModelProperty(value = "状态：1已上架，2已下架")
+	@ApiModelProperty(value = "状态：0下线  1上线")
 	private Integer status;
 	@ApiModelProperty(value = "分类id")
 	private List<ProjectLibraryDiyType> diyType;

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/projectlibrary/UpdateDiyModelForm.java

+package com.zrqx.resource.commons.form.bg.projectlibrary;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UpdateDiyModelForm {
+	@ApiModelProperty("自定义模块id")
+	private Integer id;
+	@ApiModelProperty("模块名称")
+	private String name;
+}

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/projectlibrary/UpdateProjectLibraryForm.java

 package com.zrqx.resource.commons.form.bg.projectlibrary;
 
-public class UpdateProjectLibraryForm {
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@Data
+@ApiModel(value = "UpdateProjectLibraryForm", description = "修改专题库")
+public class UpdateProjectLibraryForm {
+	@ApiModelProperty("专题id")
+	private String id;
+	@ApiModelProperty("专题名称")
+	private String name;
+	@ApiModelProperty("关联标签id")
+	private Integer labelContentId;
+	@ApiModelProperty("封面")
+	private String img;
+	@ApiModelProperty("网站背景图")
+	private String bgImg;
+	@ApiModelProperty("APP背景图")
+	private String appBgImg;
+	@ApiModelProperty("专题简介")
+	private String content;
+	@ApiModelProperty("排序号")
+	private Integer sort;
+	@ApiModelProperty("模板 1微课模板，2列表模板，3.内容模板")
+	private Integer template;
+	@ApiModelProperty("状态 0下线，1上线")
+	private Integer status;
+	@ApiModelProperty("新增自定义模块")
+	private List<String> dmsName;
+	@ApiModelProperty("修改自定义模块名称")
+	private List<UpdateDiyModelForm> dms;
+	@ApiModelProperty("删除自定义模块")
+	private List<Integer> dmsIds;
 }

app/resource/src/main/java/com/zrqx/resource/commons/model/projectlibrary/DiyModel.java

+package com.zrqx.resource.commons.model.projectlibrary;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="DiyModel",description="专题库自定义模块")
+@Table(name = "res_diy_model")
+public class DiyModel {
+	@Id
+	@ApiModelProperty("自定义模块id，新增时不需要填写")
+	@GeneratedValue(generator="JDBC")
+	private Integer id;
+	@ApiModelProperty("专题id")
+	private String pid;
+	@ApiModelProperty("模块名称")
+	private String name;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+}
\ No newline at end of file

app/resource/src/main/java/com/zrqx/resource/commons/model/projectlibrary/ProjectLibrary.java

@@ -28,8 +28,17 @@ public class ProjectLibrary {
 	private String name;
 	@ApiModelProperty("封面")
 	private String img;
+	@ApiModelProperty("网站背景图")
+	private String bgImg;
+	@ApiModelProperty("移动端背景图")
+	private String mobileBgImg;
 	@ApiModelProperty("专题简介")
 	private String synopsis;
+	@ApiModelProperty("排序号")
+	private Integer sort;
+	@ApiModelProperty("模板 1模板，2模板")
+	private Integer template;
+	/** @see com.zrqx.core.enums.resource.project.ProjectStatusEnum */
 	@ApiModelProperty("状态 0下线，1上线")
 	private Integer status;
 	@ApiModelProperty("关键词")

app/resource/src/main/java/com/zrqx/resource/commons/model/projectlibrary/ProjectModelResource.java

+package com.zrqx.resource.commons.model.projectlibrary;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="ProjectLibraryDiyModelResoures",description="专题库模块关联资源")
+@Table(name = "res_project_model_resoures")
+public class ProjectModelResource {
+	@Id
+	@ApiModelProperty("专题库模块关联资源id，新增时不需要填写")
+	@GeneratedValue(generator="JDBC")
+	private Integer id;
+	
+	@ApiModelProperty("所属专题id")
+	private String pid;
+	@ApiModelProperty("缩略图 封面")
+	private String img;
+	@ApiModelProperty("推荐内容id")
+	private String resourceId;
+	@ApiModelProperty("推荐内容")
+	private String resourceName;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("简介")
+	private String synopsis;
+	@ApiModelProperty("出版时间")
+	private String publishTime;
+	@ApiModelProperty("所属模块id")
+	private Integer diyModelId;
+	@ApiModelProperty("所属模块名称")
+	private String diyModelName;
+	@ApiModelProperty("排序号")
+	private Integer sort;
+	@ApiModelProperty("添加人")
+	private String userName;
+	@ApiModelProperty("添加时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	
+	@Transient
+	@ApiModelProperty("资源类型 ")
+	private String resourceType_zh;
+	@Transient
+	@ApiModelProperty("是否是pdf：0：不是；1：是")
+	private Integer isPdf;
+	@Transient
+	@ApiModelProperty("pdf地址")
+	private String pdfPath;
+	@Transient
+	@ApiModelProperty(value = "浏览数量")
+	private Integer browseNum;
+}

app/resource/src/main/java/com/zrqx/resource/commons/model/recommend/RecommendResource.java

@@ -32,7 +32,7 @@ public class RecommendResource {
 	@ApiModelProperty(value = "资源id")
 	private String resId;
 	/** 资源类型0-10 */
-	@ApiModelProperty(value = "资源类型 0全部31理论 32药物 33方剂 34临床 35医案 36文化 37机构 38医论 48其他 1医著 2医家  ")
+	@ApiModelProperty(value = "资源类型   ")
 	private Integer resType;
 	/** 状态0：下架 1：上架 */
 	@ApiModelProperty(value = "状态0：下架 1：上架")