--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/annexlibrary/QueryAnnexLibraryForm.java

@@ -8,16 +8,8 @@ import lombok.Data;
 @Data
 @ApiModel(value="QueryAnnexLibraryForm",description="附件库")
 public class QueryAnnexLibraryForm {
-	@ApiModelProperty(value = "资源名称")
+	@ApiModelProperty(value = "资源名称、来源")
 	private String name;
-	@ApiModelProperty("所属图书")
-	private String bookName;
-	@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")

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/annexlibrary/SaveAnnexLibraryForm.java

 package com.zrqx.core.form.resource.bg.annexlibrary;
 
-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.annexlibrary.AnnexLibraryDiyType;
-import com.zrqx.core.model.resource.annexlibrary.AnnexLibraryLabelContentDiyType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 @Data
 @ApiModel(value="SaveAnnexLibraryForm",description="添加附件库")
 public class SaveAnnexLibraryForm {
@@ -17,26 +14,12 @@ public class SaveAnnexLibraryForm {
 	private List<String> names;
 	@ApiModelProperty("来源")
 	private String source;
-	@ApiModelProperty("关键词")
-	private String keywords;
-	@ApiModelProperty("定价")
-	private BigDecimal price;
-	@ApiModelProperty("售价")
-	private BigDecimal realPrice;
-	@ApiModelProperty("简介")
-	private String synopsis;
 	@ApiModelProperty("annex")
 	private List<String> annex;
 	@ApiModelProperty(value = "分类id")
 	private AnnexLibraryDiyType diyType;
-	@ApiModelProperty(value = "标签id")
-	private AnnexLibraryLabelContentDiyType label;
 	@ApiModelProperty("格式")
 	private List<String> formats;
 	@ApiModelProperty("文件大小")
 	private List<String> size;
-	@ApiModelProperty("作者id")
-	private String authorId;
-	@ApiModelProperty("作者")
-	private String author;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/annexlibrary/SaveUpdateAnnexLibraryForm.java

 package com.zrqx.core.form.resource.bg.annexlibrary;
 
-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.annexlibrary.AnnexLibraryDiyType;
-import com.zrqx.core.model.resource.annexlibrary.AnnexLibraryLabelContentDiyType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 @Data
 @ApiModel(value="SaveUpdateAnnexLibraryForm",description="添加或修改附件库")
 public class SaveUpdateAnnexLibraryForm {
@@ -21,35 +18,18 @@ public class SaveUpdateAnnexLibraryForm {
 	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
-	@ApiModelProperty("定价")
-	private BigDecimal price;
-	@ApiModelProperty("售价")
-	private BigDecimal realPrice;
 	@ApiModelProperty("文件大小")
 	private String size;
 	@ApiModelProperty("简介")
 	private String synopsis;
-	@ApiModelProperty("annex")
+	@ApiModelProperty("课件")
 	private String annex;
-	@ApiModelProperty("annex名称")
+	@ApiModelProperty("课件上传文件名称")
 	private String annexName;
 	@ApiModelProperty(value = "分类id")
 	private List<AnnexLibraryDiyType> diyType;
-	@ApiModelProperty(value = "标签id")
-	private List<AnnexLibraryLabelContentDiyType> label;
 	@ApiModelProperty("格式")
 	private String formats;
 	@ApiModelProperty("封面")
 	private String cover;
-	@ApiModelProperty("作者id")
-	private String authorId;
-	@ApiModelProperty("作者")
-	private String author;
-	@ApiModelProperty("售价选项 0 免费，1收费")
-	private Integer priceOption;
-	@ApiModelProperty("全文阅读权限 0 游客可见 1会员可见")
-	private Integer readTextPower;
-
-	@ApiModelProperty(value = "作者名称和id（用,隔开）")
-	private String authorNameAndId;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/annexlibrary/AnnexLibraryDiyType.java

 package com.zrqx.core.model.resource.annexlibrary;
 
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -13,9 +14,9 @@ import lombok.Data;
 @Table(name = "res_Annex_Library_Diy_Type")
 public class AnnexLibraryDiyType {
 	@Id
-	@GeneratedValue(generator="JDBC")
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
 	@ApiModelProperty("视频与自定义分类关系表id")
-	private Integer id;
+	private String id;
 	@ApiModelProperty("附件库id")
 	private String annexId;
 	@ApiModelProperty("自定义分类id")

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/annexlibrary/AnnexLibraryListVO.java

@@ -15,20 +15,6 @@ public class AnnexLibraryListVO {
 	private String name;
 	@ApiModelProperty("来源")
 	private String source;
-	@ApiModelProperty("定价")
-	private String price;
-	@ApiModelProperty("售价")
-	private String realPrice;
 	@ApiModelProperty("上传时间")
 	private Date uploadTime;
-	@ApiModelProperty("时长")
-	private String timeLength;
-	@ApiModelProperty("大小")
-	private String size;
-	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
-	private String status;
-	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
-	private String status_zh;
-	@ApiModelProperty("作者")
-	private String author;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/annexlibrary/AnnexLibraryOneVO.java

 package com.zrqx.core.vo.resource.annexlibrary;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 import java.util.List;
 
-import lombok.Data;
-
 import com.zrqx.core.model.resource.annexlibrary.AnnexLibraryDiyType;
-import com.zrqx.core.model.resource.annexlibrary.AnnexLibraryLabelContentDiyType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 @Data
 @ApiModel(value="AnnexLibraryOneVO",description="单个查询视频返回的实体")
 public class AnnexLibraryOneVO {
@@ -20,10 +18,6 @@ public class AnnexLibraryOneVO {
 	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
-	@ApiModelProperty("定价")
-	private String price;
-	@ApiModelProperty("售价")
-	private String realPrice;
 	@ApiModelProperty("简介")
 	private String synopsis;
 	@ApiModelProperty("正文")
@@ -34,20 +28,6 @@ public class AnnexLibraryOneVO {
 	private String annexName;
 	@ApiModelProperty(value = "分类id")
 	private List<AnnexLibraryDiyType> diyType;
-	@ApiModelProperty(value = "标签id")
-	private List<AnnexLibraryLabelContentDiyType> label;
-	@ApiModelProperty(value = "标签内容id")
-	private List<Integer> labelContentDiyTypeIds;
 	@ApiModelProperty("封面")
 	private String cover;
-	@ApiModelProperty("作者id")
-	private String authorId;
-	@ApiModelProperty("作者")
-	private String author;
-	@ApiModelProperty("全文阅读权限 0 游客可见 1会员可见")
-	private Integer readTextPower;
-	@ApiModelProperty("售价选项 0 免费，1收费")
-	private Integer priceOption;
-	@ApiModelProperty(value = "作者名称和id（用,隔开）")
-	private String authorNameAndId;
 }