--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/publicLibrary/ClassifyRelationForm.java

+package com.zrqx.core.form.resource.bg.publicLibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import lombok.Data;
+@Data
+@ApiModel(value="ClassifyRelationForm",description="添加自定义分类")
+public class ClassifyRelationForm {
+	@ApiModelProperty("id集合")
+	private List<String> ids;
+	@ApiModelProperty("资源类型")
+	private Integer objectType;
+	@ApiModelProperty(value = "自定义分类id")
+	private List<String> diyTypeId;
+	@ApiModelProperty(value = "自定义分类code")
+	private List<String> diyTypeCode;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/publicLibrary/LabelRelationForm.java

+package com.zrqx.core.form.resource.bg.publicLibrary;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import lombok.Data;
+@Data
+@ApiModel(value="SaveUpdateLabelRelationForm",description="添加自定义标签表")
+public class LabelRelationForm {
+	@ApiModelProperty("资源Id")
+	private String objectId;
+	@ApiModelProperty("资源类型")
+	private Integer objectType;
+	@ApiModelProperty(value = "标签id")
+	private List<String> labelId;
+	@ApiModelProperty(value = "标签内容id")
+	private List<String> labelContentId;
+	@ApiModelProperty(value = "标签内容code")
+	private List<String> labelContentCode;
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/publicLibrary/PublicController.java

@@ -36,7 +36,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
 import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
 import com.zrqx.core.form.resource.bg.ebook.ExportForm;
-import com.zrqx.core.form.resource.bg.imagelibrary.BatchUpdateImageLibraryForm;
+import com.zrqx.core.form.resource.bg.publicLibrary.ClassifyRelationForm;
 import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
 import com.zrqx.core.model.resource.publicLibrary.ResourceRelation;
 import com.zrqx.core.util.CallBack;
@@ -259,7 +259,7 @@ public class PublicController {
 	}
 	@ApiOperation(value = "批量修改分类", notes = "批量修改分类")
 	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_DIYTIPE)
-	public CallBack<Boolean> updateDivType(@RequestBody BatchUpdateImageLibraryForm form) {
+	public CallBack<Boolean> updateDivType(@RequestBody ClassifyRelationForm form) {
 		List<ClassifyRelation> list = new ArrayList<ClassifyRelation>();
 		form.getIds().forEach(objectId -> {
 			//刪除原有的分类