--no commit message

com.zrqx.core/.classpath

@@ -15,11 +15,13 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
@@ -33,5 +35,22 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.zrqx.core/src/main/java/com/zrqx/core/constant/resource/ResourceRequestPath.java

@@ -47,6 +47,9 @@ public class ResourceRequestPath extends BaseRequestPath {
 	public static final String RES_UPDATE = "/res" + UPDATE ;
 	/** 获取推荐组资源 */
 	public static final String RES_OID = "/res" + OID ;
+	
+	public static final String CODE ="/{code}";
+	
 	/**
 	 * 弹窗里的列表
 	 */

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/AddRecommendForm.java

+package com.zrqx.core.form.resource.bg.articlelibrary;
+
+import java.util.List;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="AddRecommendForm",description="添加关联")
+public class AddRecommendForm {
+
+	@ApiModelProperty("分类code")
+	private String code;
+	@ApiModelProperty("资源id")
+	private List<String> objectIds;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/QueryDiyRecommendForm.java

+package com.zrqx.core.form.resource.bg.articlelibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="QueryDiyRecommendForm",description="文章库自定义分类")
+public class QueryDiyRecommendForm {
+	@ApiModelProperty("标题")
+	private String title;
+	@ApiModelProperty("自定义分类code")
+	private String diyTypeCode;
+	
+}

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

@@ -3,6 +3,7 @@ package com.zrqx.core.model.resource.diytype;
 import java.util.Date;
 
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -11,28 +12,27 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * 分类推荐图书
  * 
- * @author lpf
- * @date 2018年7月11日上午9:48:32
+ * @author Administrator
+ *
  */
-@ApiModel(value = "DiyTypeRecommendGoods", description = "分类推荐商品")
+@ApiModel(value = "DiyTypeRecommend", description = "分类推荐商品")
 @Data
-@Table(name = "bk_diytype_recommend_goods")
+@Table(name = "res_diy_type_recommend")
 public class DiyTypeRecommend {
 
-	@ApiModelProperty("id")
+	@ApiModelProperty("id 添加时不填写")
 	@Id
-	@GeneratedValue(generator = "JDBC")
-	private Integer id;
-	@ApiModelProperty("商品id")
-	private Integer objectId;
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	private String id;
+	@ApiModelProperty("资源id")
+	private String objectId;
 	@ApiModelProperty("名称")
 	private String title;
 	@ApiModelProperty("简介")
-	private String intro;
+	private String synopsis;
 	@ApiModelProperty("排序号")
-	private Integer sort;
+	private Integer sortNum;
 
 	@ApiModelProperty("分类id")
 	private Integer diyTypeId;