--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 java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zrqx.core.constant.resource.ResourceRequestPath;
 import com.zrqx.core.form.GoodsForm;
 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;
@@ -31,14 +34,14 @@ public class FgMemberCollectionController {
 	
 	@ApiOperation(value = "批量添加收藏",notes="返回成功条数")
 	@PostMapping(value = ResourceRequestPath.BATCH_SAVE)
-	public CallBack<Integer> batchAddMemberCollection(@RequestBody MemberCollectionForm form) {
+	public CallBack<Integer> batchAddMemberCollection(@RequestBody List<MemberCollection> form) {
 		return CallBack.success(service.saveMemberCollection(form));
 	}
 	
 	@ApiOperation(value = "批量取消收藏",notes="返回成功条数")
 	@PostMapping(value = ResourceRequestPath.BATCH_DELETE)
-	public CallBack<Integer> batchDeleteMemberCollection(@RequestBody MemberCollectionForm form) {
-		return CallBack.success(service.deleteMemberCollection(form));
+	public CallBack<Integer> batchDeleteMemberCollection(@RequestBody List<String> ids) {
+		return CallBack.success(service.deleteMemberCollection(ids));
 	}
 	
 	@ApiOperation(value = "是否收藏",notes="1有收藏0没有收藏")

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

 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.MemberCollectionForm;
 import com.zrqx.core.model.member.MemberCollection;
@@ -17,14 +19,14 @@ public interface FgMemberCollectionService extends BaseService<MemberCollection,
 	 * @param form
 	 * @return 成功条数
 	 */
-	Integer saveMemberCollection(MemberCollectionForm form);
+	Integer saveMemberCollection(List<MemberCollection> form);
 
 	/**
 	 * 批量取消收藏
 	 * @param form
 	 * @return 成功条数
 	 */
-	Integer deleteMemberCollection(MemberCollectionForm form);
+	Integer deleteMemberCollection(List<String> ids);
 
 	/**
 	 * 获取是否收藏

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

 package com.zrqx.member.fg.membercollection.service;
 
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.zrqx.core.enums.GoodsTypeEnum;
+import com.zrqx.core.enums.ResourceTypeEnum;
 import com.zrqx.core.form.GoodsForm;
 import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
 import com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm;
@@ -25,7 +22,8 @@ import com.zrqx.member.fg.membercollection.manage.FgMemberConllectionManage;
 import com.zrqx.member.fg.membercollection.mapper.FgMemberCollectionMapper;
 
 @Service
-public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollection, Integer> implements FgMemberCollectionService {
+public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollection, Integer>
+		implements FgMemberCollectionService {
 
 	@Autowired
 	private FgMemberCollectionMapper mapper;
@@ -34,74 +32,41 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 	private Redis fgRedisManage;
 	@Autowired
 	private FgMemberConllectionManage fgMemberConllectionManage;
-	
+
 	@Override
 	public BaseMapper<MemberCollection> getMapper() {
 		return mapper;
 	}
 
 	@Override
-	public Integer saveMemberCollection(MemberCollectionForm form) {
-		MemberCollection mc = null;
-		List<GoodsForm> list = form.getGoodsList();
+	public Integer saveMemberCollection(List<MemberCollection> form) {
 		List<MemberCollection> insertList = new ArrayList<MemberCollection>();
-		
-		LoginMemberInfo member = fgRedisManage.getMember();
-		String memberId = member.getId().toString();
-		
-		//用于去掉重复数据
-		Map<String,String> map = new HashMap<String,String>();
-		for (GoodsForm gf : list) {
-			if(map.get(gf.getId())!=null){
-				if(gf.getType().equals(map.get(gf.getId()))){
-					continue;
-				}
-			}
-			
-			MemberCollection record = new MemberCollection();
-			record.setMemberId(memberId);
-			record.setObjectId(String.valueOf(gf.getId()));
-			record.setObjectType(gf.getType());
-			record.setMemberType(form.getMemberType());
-			
-			mc = selectOne(record);
-			
-			if(mc == null){
-				mc = new MemberCollection();
-				mc.setMemberId(memberId);
-				mc.setObjectId(String.valueOf(gf.getId()));
-				mc.setObjectType(gf.getType());
-				mc.setCreateTime(new Date());
-				mc.setMemberType(form.getMemberType());
-				
+		for (MemberCollection mc : form) {
+			MemberCollection hasM = mapper.selectOne(mc);
+			if (hasM == null) {
 				insertList.add(mc);
-				map.put(String.valueOf(gf.getId()), gf.getType());
 			}
-			
 		}
 		int result = 0;
-		if(insertList.size()>0){
+		if (insertList.size() > 0) {
 			result = mapper.insertList(insertList);
 		}
 		return result;
 	}
 
 	@Override
-	public Integer deleteMemberCollection(MemberCollectionForm form) {
+	public Integer deleteMemberCollection(List<String> ids) {
 		int result = 0;
 		LoginMemberInfo member = fgRedisManage.getMember();
 		String memberId = member.getId().toString();
-		
+
 		MemberCollection mc = null;
-		List<GoodsForm> list = form.getGoodsList();
-		for (GoodsForm gf : list) {
+		for (String id : ids) {
 			mc = new MemberCollection();
 			mc.setMemberId(memberId);
-			mc.setObjectId(String.valueOf(gf.getId()));
-			mc.setObjectType(gf.getType());
-			mc.setMemberType(form.getMemberType());
+			mc.setObjectId(String.valueOf(id));
 
-			if(delete(mc)){
+			if (delete(mc)) {
 				result++;
 			}
 
@@ -112,12 +77,12 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 
 	@Override
 	public Integer checkIsCollect(GoodsForm form) {
-		
+
 		return fgMemberConllectionManage.checkIsCollect(form);
 	}
-	
+
 	@Override
-	public Integer queryAuthorCollectNum(String oid){
+	public Integer queryAuthorCollectNum(String oid) {
 		return fgMemberConllectionManage.queryAuthorCollectNum(oid);
 	}
 
@@ -127,16 +92,15 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 		String memberId = member.getId().toString();
 		form.setMemberId(memberId);
 		List<FgMemberCollectionVo> list = null;
-		String type = form.getGoodsType();
-		if(GoodsTypeEnum.EBOOK.getCode().equals(type)){
+		String type = form.getObjectType();
+		if (ResourceTypeEnum.BOOK.getCode().equals(type)) {
 			startPage(pageParam);
 			list = mapper.queryBookPage(form);
-		//}else if(GoodsTypeEnum.ARTICLE.getCode().equals(type)){
-		}else if("2-2".equals(type)){
+		} else if (ResourceTypeEnum.ARTICLE.getCode().equals(type)) {
 			startPage(pageParam);
 			list = mapper.queryArticlePage(form);
 		}
-		
+
 		return new PageInfo<FgMemberCollectionVo>(list);
 	}
 
@@ -144,10 +108,9 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 	public PageInfo<AuthorLibrary> queryPageMyCollect(PageParam pageParam, Integer type) {
 		String memberId = String.valueOf(fgRedisManage.getMember().getId());
 		startPage(pageParam);
-		List<AuthorLibrary> list = mapper.queryPageMyCollect(memberId,type);
-		
+		List<AuthorLibrary> list = mapper.queryPageMyCollect(memberId, type);
+
 		return new PageInfo<AuthorLibrary>(list);
 	}
 
-	
 }