--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/membercollection/controller/FgMemberCollectionController.java

 package com.zrqx.member.fg.membercollection.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -9,21 +13,19 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ctc.wstx.util.StringUtil;
 import com.zrqx.core.constant.resource.ResourceRequestPath;
+import com.zrqx.core.exception.ParameterValidateException;
 import com.zrqx.core.form.GoodsForm;
+import com.zrqx.core.form.resource.fg.membercollection.CancelCollectionForm;
 import com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm;
 import com.zrqx.core.model.member.MemberCollection;
-import com.zrqx.core.model.resource.authorLibrary.AuthorLibrary;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.fg.membercollection.FgMemberCollectionVo;
 import com.zrqx.member.fg.membercollection.service.FgMemberCollectionService;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
 @RestController
 @RequestMapping(ResourceRequestPath.FG + ResourceRequestPath.MEMBER_COLLECTION)
 @Api(description = "前台-收藏")
@@ -46,8 +48,11 @@ public class FgMemberCollectionController {
 	
 	@ApiOperation(value = "取消收藏",notes="取消收藏")
 	@PostMapping(value = ResourceRequestPath.DELETE)
-	public CallBack<Boolean> batchDeleteMemberCollection(@RequestBody String objectId) {
-		return CallBack.success(service.deleteCollection(objectId));
+	public CallBack<Boolean> batchDeleteMemberCollection(@RequestBody CancelCollectionForm form) {
+		if(form == null || StringUtils.isBlank(form.getObjectId()) || StringUtils.isBlank(form.getObjectType()) || form.getType() == null){
+			throw new ParameterValidateException("参数不可为空");
+		}
+		return CallBack.success(service.deleteCollection(form));
 	}
 	
 	@ApiOperation(value = "是否收藏",notes="1有收藏0没有收藏")

com.zrqx.member/src/main/java/com/zrqx/member/fg/membercollection/service/FgMemberCollectionService.java

@@ -3,6 +3,7 @@ package com.zrqx.member.fg.membercollection.service;
 import java.util.List;
 
 import com.zrqx.core.form.GoodsForm;
+import com.zrqx.core.form.resource.fg.membercollection.CancelCollectionForm;
 import com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm;
 import com.zrqx.core.model.member.MemberCollection;
 import com.zrqx.core.model.resource.authorLibrary.AuthorLibrary;
@@ -29,11 +30,11 @@ public interface FgMemberCollectionService extends BaseService<MemberCollection,
 	Integer deleteMemberCollection(List<String> ids);
 	
 	/**
-	   * 文章取消收藏
+	 * 取消收藏
 	 * @param form
 	 * @return 成功条数
 	 */
-	Boolean deleteCollection(String objectId);
+	Boolean deleteCollection(CancelCollectionForm form);
 
 	/**
 	 * 获取是否收藏

com.zrqx.member/src/main/java/com/zrqx/member/fg/membercollection/service/FgMemberCollectionServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import com.zrqx.core.form.GoodsForm;
 import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
+import com.zrqx.core.form.resource.fg.membercollection.CancelCollectionForm;
 import com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.MemberCollection;
@@ -83,12 +84,14 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 	}
 	
 	@Override
-	public Boolean deleteCollection(String objectId) {
+	public Boolean deleteCollection(CancelCollectionForm form) {
 		LoginMemberInfo member = fgRedisManage.getMember();
 		String memberId = member.getId().toString();
 		MemberCollection mc = new MemberCollection();
 		mc.setMemberId(memberId);
-		mc.setObjectId(objectId);
+		mc.setObjectId(form.getObjectId());
+		mc.setObjectType(form.getObjectType());
+		mc.setType(form.getType());
 		return delete(mc);
 	}