--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/SaveResourceRelationForm.java

@@ -10,8 +10,6 @@ public class SaveResourceRelationForm {
 	private String id;
 	@ApiModelProperty("被关联资源id")
 	private String  resourceId;
-	@ApiModelProperty("资源类型   1杂志、2文章、3PDF")
-	private Integer resourceType;
 	@ApiModelProperty("录入方式：1:手动 2EPUB")
 	private Integer goodsType;
 	@ApiModelProperty("作者")

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/imagelibrary/QueryImageRelationLibraryForm.java

+package com.zrqx.core.form.resource.bg.imagelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="QueryImageRelationLibraryForm",description="图片库")
+public class QueryImageRelationLibraryForm {
+	@ApiModelProperty(value = "图片名称")
+	private String name;
+	@ApiModelProperty("状态：1已上架，2已下架")
+	private String status;
+	@ApiModelProperty("分类id")
+	private String dtId;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/imagelibrary/SaveImageLibraryForm.java

@@ -2,6 +2,8 @@ package com.zrqx.core.form.resource.bg.imagelibrary;
 
 import java.util.List;
 
+import com.zrqx.core.model.resource.diytype.DiyTypeRelation;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,4 +22,6 @@ public class SaveImageLibraryForm {
 	private List<String> formats;
 	@ApiModelProperty("文件大小")
 	private List<String> size;
+	@ApiModelProperty(value = "分类id")
+	private List<DiyTypeRelation> diyType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/imagelibrary/SaveUpdateImageLibraryForm.java

 package com.zrqx.core.form.resource.bg.imagelibrary;
 
+import java.util.List;
+
+import com.zrqx.core.model.resource.diytype.DiyTypeRelation;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,5 +24,9 @@ public class SaveUpdateImageLibraryForm {
 	private String formats;
 	@ApiModelProperty("文件大小")
 	private String size;
+	@ApiModelProperty("排序号")
+	private Integer sort;
+	@ApiModelProperty(value = "分类id")
+	private List<DiyTypeRelation> diyType;
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/diytype/DiyTypeRelation.java

+package com.zrqx.core.model.resource.diytype;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Data
+@ApiModel(value="DiyTypeRelation",description="文章与自定义分类关系表")
+@Table(name = "res_Diy_Type_Relation")
+public class DiyTypeRelation {
+	@Id
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	@ApiModelProperty("文章与自定义分类关系表id")
+	private String id;
+	@ApiModelProperty("文章库id")
+	private String resId;
+	@ApiModelProperty("自定义分类id")
+	private Integer dtId;
+	@ApiModelProperty("自定义分类code")
+	private String code;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/imagelibrary/ImageLibrary.java

@@ -42,7 +42,7 @@ public class ImageLibrary {
 	private String image;
 	@ApiModelProperty("缩略图")
 	private String image_sl;
-	@ApiModelProperty("状态：0已录入，1已上架，2已下架")
+	@ApiModelProperty("状态：1已上架，0已下架")
 	private Integer status;
 	@ApiModelProperty("图书id")
 	private String bookId;

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/resourcerelation/ResourceRelation.java

@@ -20,17 +20,25 @@ public class ResourceRelation {
 	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
 	@ApiModelProperty("关联表id")
 	private String id;
-	@ApiModelProperty("视频id")
-	private String objectId;
-	@ApiModelProperty("资源id")
-	private String resourceId;
-	@ApiModelProperty("资源类型")
-	private Integer resourceType;
+	@ApiModelProperty(value = "图片名称")
+	private String name;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("简介")
+	private String synopsis;
+	@ApiModelProperty("images")
+	private String image;
+	@ApiModelProperty("格式")
+	private String formats;
+	@ApiModelProperty("文件大小")
+	private String size;
 	@ApiModelProperty("排序号")
 	private Integer sort;
 	@ApiModelProperty("创建时间")
 	private Date uploadTime;
-	@ApiModelProperty("录入方式：1:手动 2EPUB")
-	private Integer goodsType;
+	@ApiModelProperty("状态：1已上架，0已下架")
+	private Integer status;
+	@ApiModelProperty("更新时间")
+	private Date updateTime;
 
 }