--no commit message

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

@@ -62,15 +62,15 @@ public class FgMemberCollectionController {
 		return CallBack.success(service.queryPage(form,pageParam));
 	}
 	
-	@ApiOperation("获取我的关注列表")
+	/*@ApiOperation("获取我的关注列表")
 	@GetMapping(ResourceRequestPath.PAGE_MY_COLLECT)
 	public CallBack<PageInfo<AuthorLibrary>> queryPageMyCollect(PageParam pageParam,Integer type){
 		return CallBack.success(service.queryPageMyCollect(pageParam,type));
-	}
+	}*/
 	
-	@ApiOperation("获取关注该专家用户数量")
+	/*@ApiOperation("获取关注该专家用户数量")
 	@GetMapping(ResourceRequestPath.AUTHOR_COLLECT_NUM)
 	public CallBack<Integer> queryAuthorCollectNum(@ApiParam(value = "专家id")String oid){
 		return CallBack.success(service.queryAuthorCollectNum(oid));
-	}
+	}*/
 }

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.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-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;
@@ -15,6 +15,7 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.MemberCollection;
 import com.zrqx.core.model.resource.authorLibrary.AuthorLibrary;
 import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.membercollection.FgMemberCollectionVo;
@@ -46,6 +47,7 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 		List<MemberCollection> insertList = new ArrayList<MemberCollection>();
 		for (MemberCollection mc : form) {
 			mc.setMemberId(memberId);
+			mc.setCreateTime(new Date());
 			MemberCollection hasM = mapper.selectOne(mc);
 			if (hasM == null) {
 				insertList.add(mc);
@@ -105,16 +107,23 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 	public PageInfo<FgMemberCollectionVo> queryPage(MemberCollectionForm form, PageParam pageParam) {
 		LoginMemberInfo member = fgRedisManage.getMember();
 		String memberId = member.getId().toString();
-		form.setMemberId(memberId);
-		List<FgMemberCollectionVo> list = null;
-		String type = form.getObjectType();
-		if (ResourceTypeEnum.BOOK.getCode().equals(type)) {
+		MemberCollection mc = new MemberCollection();
+		
+		BeanUtils.copyProperties(form, mc);
+		mc.setMemberId(memberId);
+		startPage(pageParam);
+		List<MemberCollection> voList = mapper.select(mc);
+		PageInfo<MemberCollection> page = new PageInfo<MemberCollection>(voList);
+		PageInfo<FgMemberCollectionVo> page1 = new PageInfo<FgMemberCollectionVo>();
+		BeanUtils.copyProperties(page, page1);
+		List<FgMemberCollectionVo> list = BeanUtils.copyList(voList, FgMemberCollectionVo.class);
+		/*if (ResourceTypeEnum.BOOK.getCode().equals(type)) {
 			startPage(pageParam);
 			list = mapper.queryBookPage(form);
 		} else if (ResourceTypeEnum.ARTICLE.getCode().equals(type)) {
 			startPage(pageParam);
 			list = mapper.queryArticlePage(form);
-		}
+		}*/
 		if(list != null){
 			for(int i=0;i<list.size();i++){
 				FgMemberCollectionVo vo = list.get(i);
@@ -125,11 +134,13 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 				list.set(i, vo);
 			}
 		}
-		return new PageInfo<FgMemberCollectionVo>(list);
+		page1.setList(list);
+		return page1;
 	}
 	
 	public static String cutOutImgPrefix(String str){
-		String regex = "<img[^>]*/>";
+		//String regex = "<img[^>]*/>";
+		String regex = "\\<.*?>";
 		return str.replaceAll(regex, "");
 	}