--no commit message

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

@@ -8,8 +8,16 @@ import lombok.Data;
 public class QueryResourceRelationForm {
 	@ApiModelProperty(value = "当前资源id",required = true)
 	private String id;
-	@ApiModelProperty(value = "当前资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件",required = true)
+	@ApiModelProperty(value = "资源类型1时辰库，2经络库，3穴位库，4视频库",required = true)
 	private Integer type;
-	@ApiModelProperty("资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件")
+	@ApiModelProperty("资源类型1时辰库，2经络库，3穴位库，4视频库")
 	private Integer resourceType;
+	@ApiModelProperty(value = "文章标题")
+	private String name;
+	@ApiModelProperty(value="上传时间-开始")
+	private String beginTime;
+	@ApiModelProperty(value="上传时间-结束")
+	private String endTime;
+	@ApiModelProperty("审核状态0未审核1审核通过2审核未通过")
+	private Integer status;
 }

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

@@ -7,7 +7,7 @@ import lombok.Data;
 public class SaveResourceRelationForm {
 	@ApiModelProperty("当前资源id")
 	private String id;
-	@ApiModelProperty("资源类型   1时辰库，2经络库，3穴位库，4视频库\"")
+	@ApiModelProperty("资源类型   1时辰库，2经络库，3穴位库，4视频库")
 	private Integer type;
 	@ApiModelProperty("被关联资源id")
 	private String[] resourceIds;

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/articlelibrary/BatchUpdateArticleLibraryForm.java

+package com.zrqx.resource.commons.form.bg.articlelibrary;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.zrqx.resource.commons.model.articlelibrary.ArticleLibraryDiyType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="BatchUpdateArticleLibraryForm",description="批量修改文章")
+public class BatchUpdateArticleLibraryForm {
+	@ApiModelProperty("文章id集合")
+	private List<String> ids;
+	@ApiModelProperty(value = "状态：0待审核，1已上架，2已下架")
+	private Integer status;
+	@ApiModelProperty(value = "分类id")
+	private List<ArticleLibraryDiyType> diyType;
+	@ApiModelProperty("定价")
+	private BigDecimal price;
+	@ApiModelProperty("售价")
+	private BigDecimal realPrice;
+	@ApiModelProperty("全文阅读权限 0 游客可见 1会员可见")
+	private Integer readTextPower;
+}

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/articlelibrary/QueryArticleLibraryForm.java

+package com.zrqx.resource.commons.form.bg.articlelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="QueryArticleLibraryForm",description="文章库")
+public class QueryArticleLibraryForm {
+	@ApiModelProperty(value = "文章标题")
+	private String name;
+	@ApiModelProperty(value="上传时间-开始")
+	private String beginTime;
+	@ApiModelProperty(value="上传时间-结束")
+	private String endTime;
+	@ApiModelProperty(value="资源id")
+	private String objectId;
+}

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/articlelibrary/SaveUpdateArticleLibraryForm.java

+package com.zrqx.resource.commons.form.bg.articlelibrary;
+
+import java.util.List;
+
+import com.zrqx.resource.commons.model.articlelibrary.ArticleLibraryDiyType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="saveUpdateArticleLibraryForm",description="文章库")
+public class SaveUpdateArticleLibraryForm {
+	@ApiModelProperty("文章id")
+	private String id;
+	@ApiModelProperty(value = "文章标题", required = true)
+	private String name;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("文章内容")
+	private String text;
+	@ApiModelProperty("链接")
+	private String url;
+	@ApiModelProperty("排序")
+	private Integer sort;
+	@ApiModelProperty("置顶0不是1是")
+	private Integer isTop;
+	@ApiModelProperty("状态0未审核1审核通过2审核未通过")
+	private Integer status;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("视频id")
+	private String videoId;
+	@ApiModelProperty("视频名称")
+	private String videoName;
+	@ApiModelProperty("视频类型")
+	private Integer videoType;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("时长")
+	private String timeLength;
+	@ApiModelProperty("文件大小")
+	private String size;
+	@ApiModelProperty(value = "分类")
+	private List<ArticleLibraryDiyType> diyType;
+	@ApiModelProperty(value="资源ID", required = true)
+	private String objectId;
+}

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/articlelibrary/UpdateArticleImgForm.java

+package com.zrqx.resource.commons.form.bg.articlelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="UpdateArticleImgForm",description="修改文章封面")
+public class UpdateArticleImgForm {
+	@ApiModelProperty("文章id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("封面")
+	private String img;
+}

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

 package com.zrqx.resource.commons.form.bg.resource;
 
-import io.swagger.annotations.ApiModelProperty;
-
 import java.util.List;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -15,4 +14,6 @@ public class UpdateRelationForm {
 	private Integer sort;
 	@ApiModelProperty("资源类型")
 	private Integer resourceType;
+	@ApiModelProperty("置顶0否1是")
+	private Integer isTop;
 }

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/videolibrary/SaveUpdateVideoLibraryForm.java

@@ -54,4 +54,10 @@ public class SaveUpdateVideoLibraryForm {
 	private String authorNameAndId;
 	@ApiModelProperty("审核意见")
 	private String auditOpinion;
+	@ApiModelProperty("资源id")
+	private String objectId;
+	@ApiModelProperty("排序")
+	private Integer sort;
+	@ApiModelProperty("置顶0不是1是")
+	private Integer isTop;
 }

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibrary.java

+package com.zrqx.resource.commons.model.articlelibrary;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="ArticleLibrary",description="文章库")
+@Table(name = "res_Article_Library")
+public class ArticleLibrary {
+	@Id
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	@ApiModelProperty("文章id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty(value = "文章标题", required = true)
+	private String name;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("链接")
+	private String url;
+	@ApiModelProperty("排序")
+	private Integer sort;
+	@ApiModelProperty("置顶")
+	private Integer isTop;
+	@ApiModelProperty("内容")
+	private String text;
+	@ApiModelProperty("发布时间")
+	private Date uploadTime;
+	@ApiModelProperty("发布人")
+	private String editor;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("视频id")
+	private String videoId;
+	@ApiModelProperty("视频名称")
+	private String videoName;
+	@ApiModelProperty("视频类型")
+	private Integer videoType;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("发布人id")
+	private String editorId;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("资源ID")
+	private String objectId;
+	@ApiModelProperty("审核意见")
+	private String auditOpinion;
+	@ApiModelProperty("状态：0待审核，1审核通过，审核未通过")
+	private Integer status;
+	
+}

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibraryDiyType.java

+package com.zrqx.resource.commons.model.articlelibrary;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="ArticleLibraryDiyType",description="文章与自定义分类关系表")
+@Table(name = "res_Article_Library_Diy_Type")
+public class ArticleLibraryDiyType {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("文章与自定义分类关系表id")
+	private Integer id;
+	@ApiModelProperty("文章库id")
+	private String articleId;
+	@ApiModelProperty("自定义分类id")
+	private Integer dtId;
+	@ApiModelProperty("自定义分类code")
+	private String code;
+}

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibraryLabelContentDiyType.java

+package com.zrqx.resource.commons.model.articlelibrary;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="ArticleLibraryLabelContentDiyType",description="文章与标签关系表")
+@Table(name = "res_Article_Library_Label_Content_Diy_Type")
+public class ArticleLibraryLabelContentDiyType {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("文章与标签内容关系表id")
+	private Integer id;
+	@ApiModelProperty("文章id")
+	private String alId;
+	@ApiModelProperty(value = "标签id")
+	private Integer labelId;
+	@ApiModelProperty(value = "标签内容id")
+	private Integer labelContentDiyTypeId;
+	@ApiModelProperty(value = "标签内容code")
+	private String labelContentDiyTypeCode;
+}

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleResource.java

+package com.zrqx.resource.commons.model.articlelibrary;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Table(name = "res_Article_Resource")
+@ApiModel(value = "ArticleResource", description = "文章关联资源")
+public class ArticleResource {
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("关联表id")
+	private Integer id;
+	@ApiModelProperty("文章id")
+	private String articleId;
+	@ApiModelProperty("资源id")
+	private String resourceId;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	@ApiModelProperty("排序")
+	private Integer sort;
+}

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ChapterLibrary.java

+package com.zrqx.resource.commons.model.articlelibrary;
+// default package
+
+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;
+
+
+
+/**
+ * Chapter entity. @author MyEclipse Persistence Tools
+ * 章节目录信息
+ */
+/** 
+* @ClassName: Chapter 
+* @author 刘自耀
+* @date 2015-7-2 上午11:28:44 
+*  
+*/ 
+@Data
+@ApiModel(value="chapterLibrary",description="文章库")
+@Table(name = "res_chapter_Library")
+public class ChapterLibrary implements java.io.Serializable {
+
+	// Fields
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty("目录id，新增时不需要填写")
+	private Integer id;
+	@ApiModelProperty(value = "目录标题", required = true)
+	private String chapterName;
+	@ApiModelProperty(value = "父章节id（第一级为0，之后为父级的markid）", required = true)
+	private String pid;
+	@ApiModelProperty(value = "所属图书id", required = true)
+	private String bookid;
+	@ApiModelProperty(value = "所属图书名称", required = true)
+	private String bookName;
+	@ApiModelProperty(value = "章节排序", required = true)
+	private Integer orderNum;
+	@ApiModelProperty(value = "章节标识号（bookid+txt编号）", required = true)
+	private String markid;
+	@ApiModelProperty(value = "章节层级（1，2，3，4，5）", required = true)
+	private Integer level;
+	@ApiModelProperty(value = "pdf页码", required = true)
+	private Integer pdfNum;
+	
+}
\ No newline at end of file

app/resource/src/main/java/com/zrqx/resource/commons/model/resourcerelation/ResourceRelation.java

@@ -2,13 +2,12 @@ package com.zrqx.resource.commons.model.resourcerelation;
 
 import java.util.Date;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -29,4 +28,6 @@ public class ResourceRelation {
 	private Integer sort;
 	@ApiModelProperty("创建时间")
 	private Date createTime;
+	@ApiModelProperty("置顶")
+	private Integer isTop;
 }

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/ResourceRelationVo.java

 package com.zrqx.resource.commons.vo.bg;
 
-import io.swagger.annotations.ApiModelProperty;
-
 import java.util.Date;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
 public class ResourceRelationVo {
@@ -21,4 +20,15 @@ public class ResourceRelationVo {
 	private Date createTime;
 	@ApiModelProperty("排序")
 	private Integer sort;
+	@ApiModelProperty("置顶1是0否")
+	private Integer isTop;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("发布时间")
+	private Date uploadTime;
+	@ApiModelProperty("状态：0待审核，1审核通过，审核未通过")
+	private Integer status;
+
 }

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/articlelibrary/ArticleLibraryListVO.java

+package com.zrqx.resource.commons.vo.bg.articlelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+@Data
+@ApiModel(value="ArticleLibraryListVO",description="查询文章集合返回的实体")
+public class ArticleLibraryListVO {
+	@ApiModelProperty("文章id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty(value = "文章标题")
+	private String name;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("所属图书")
+	private String bookName;
+	@ApiModelProperty("定价")
+	private String price;
+	@ApiModelProperty("售价")
+	private String realPrice;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
+	private String status_zh;
+	@ApiModelProperty("封面图片")
+	private String img;
+	@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 String auditOpinion;
+	@ApiModelProperty("状态：0待审核，1审核通过，审核未通过")
+	private Integer status;
+}

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/articlelibrary/ArticleLibraryOneVO.java

+package com.zrqx.resource.commons.vo.bg.articlelibrary;
+
+import java.util.List;
+
+import com.zrqx.resource.commons.model.articlelibrary.ArticleLibraryDiyType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="ArticleLibraryOneVO",description="单个查询文章返回的实体")
+public class ArticleLibraryOneVO {
+	@ApiModelProperty("文章id")
+	private String id;
+	@ApiModelProperty(value = "文章标题", required = true)
+	private String name;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("文章内容")
+	private String text;
+	@ApiModelProperty("链接")
+	private String url;
+	@ApiModelProperty("排序")
+	private Integer sort;
+	@ApiModelProperty("置顶0不是1是")
+	private Integer isTop;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("视频id")
+	private String videoId;
+	@ApiModelProperty("视频名称")
+	private String videoName;
+	@ApiModelProperty("视频类型")
+	private Integer videoType;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty(value = "分类")
+	private List<ArticleLibraryDiyType> diyType;
+}

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/articlelibrary/FgArticleLibraryVO.java

+package com.zrqx.resource.commons.vo.fg.articlelibrary;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="AcupointLibraryVO",description="穴位库VO")
+public class FgArticleLibraryVO {
+	
+	@ApiModelProperty("文章id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty(value = "文章标题", required = true)
+	private String name;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("链接")
+	private String url;
+	@ApiModelProperty("排序")
+	private Integer sort;
+	@ApiModelProperty("置顶")
+	private Integer isTop;
+	@ApiModelProperty("内容")
+	private String text;
+	@ApiModelProperty("发布时间")
+	private Date uploadTime;
+	@ApiModelProperty("发布人")
+	private String editor;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("视频id")
+	private String videoId;
+	@ApiModelProperty("视频名称")
+	private String videoName;
+	@ApiModelProperty("视频类型")
+	private Integer videoType;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("发布人id")
+	private String editorId;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
+	@ApiModelProperty("资源ID")
+	private String objectId;
+	@ApiModelProperty("审核意见")
+	private String auditOpinion;
+	@ApiModelProperty("状态：0待审核，1审核通过，审核未通过")
+	private Integer status;
+
+}