1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleFriendsInfoService.java

@@ -24,8 +24,10 @@ public interface ICircleFriendsInfoService{
 
 	@HttpMethod(description = "列表",  permissionName = "记录朋友圈信息管理")
 	public Page<CircleFriendsInfo> list(
+								@HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id") Long circleId,
 								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "朋友圈发布人id") Long commonId,
-							@HttpParam(name = "head", type = HttpParamType.COMMON, description = "头像") String head,
+								@HttpParam(name = "currentCommonId", type = HttpParamType.COMMON, description = "当前登录人id") Long currentCommonId,
+								@HttpParam(name = "head", type = HttpParamType.COMMON, description = "头像") String head,
 							@HttpParam(name = "nickname", type = HttpParamType.COMMON, description = "昵称") String nickname,
 							@HttpParam(name = "content", type = HttpParamType.COMMON, description = "朋友圈内容") String content,
 							@HttpParam(name = "image", type = HttpParamType.COMMON, description = "图片") String image,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleFriendsInfoServiceImpl.java

@@ -3,11 +3,14 @@ package com.iotechn.unimall.admin.api.card.impl;
 import java.util.List;
 
 import com.iotechn.unimall.admin.api.card.ICircleFriendsInfoService;
+import com.iotechn.unimall.data.domain.CircleFriendsDetail;
 import com.iotechn.unimall.data.domain.CircleFriendsInfo;
+import com.iotechn.unimall.data.mapper.CircleFriendsDetailMapper;
 import com.iotechn.unimall.data.mapper.CircleFriendsInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -28,6 +31,8 @@ import org.springframework.transaction.annotation.Transactional;
 public class CircleFriendsInfoServiceImpl implements ICircleFriendsInfoService {
 	@Autowired
 	private CircleFriendsInfoMapper circleFriendsInfoMapper;
+	@Autowired
+	private CircleFriendsDetailMapper circleFriendsDetailMapper;
 	
 	@Override
 	public Boolean add(CircleFriendsInfo circleFriendsInfo) throws ServiceException {
@@ -38,9 +43,12 @@ public class CircleFriendsInfoServiceImpl implements ICircleFriendsInfoService {
 	}
 
 	@Override
-	public Page<CircleFriendsInfo> list(Long commonId,String head,String nickname,String content,String image,String location,String positioning,String commentFlag,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<CircleFriendsInfo> list(Long circleId,Long currentCommonId,Long commonId,String head,String nickname,String content,String image,String location,String positioning,String commentFlag,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<CircleFriendsInfo> wrapper = new EntityWrapper<CircleFriendsInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
+				if (!StringUtils.isEmpty(circleId)) {
+					wrapper.eq("circle_id", circleId);
+				}
+												if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
 				}
 												if (!StringUtils.isEmpty(head)) {
@@ -75,6 +83,40 @@ public class CircleFriendsInfoServiceImpl implements ICircleFriendsInfoService {
 				}
 							wrapper.eq("delete_flag", 0);
 		List<CircleFriendsInfo> list = circleFriendsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		if (!CollectionUtils.isEmpty(list)){
+			for (CircleFriendsInfo circleFriendsInfo:list){
+				//点赞list
+				List<CircleFriendsDetail> circleFriendsDetailList=circleFriendsDetailMapper.selectList(new EntityWrapper<CircleFriendsDetail>()
+				.eq("circle_friends_id",circleFriendsInfo.getId())
+				.eq("delete_flag",0)
+				.eq("interaction_flag","1"));
+				if(!CollectionUtils.isEmpty(circleFriendsDetailList)){
+					circleFriendsInfo.setCircleFriendsDetailList(circleFriendsDetailList);
+					circleFriendsInfo.setCount(circleFriendsDetailList.size());
+				}
+				//判断当前账号是否点赞标识
+				List<CircleFriendsDetail> circleFriendsDetailList2=circleFriendsDetailMapper.selectList(new EntityWrapper<CircleFriendsDetail>()
+						.eq("circle_friends_id",circleFriendsInfo.getId())
+						.eq("common_id",currentCommonId)
+						.eq("delete_flag",0)
+						.eq("interaction_flag","1"));
+				if(!CollectionUtils.isEmpty(circleFriendsDetailList2)){
+					circleFriendsInfo.setHelpFlag("1");
+				}
+				else {
+					circleFriendsInfo.setHelpFlag("0");
+				}
+				//评论list
+				List<CircleFriendsDetail> circleFriendsDetailList1=circleFriendsDetailMapper.selectList(new EntityWrapper<CircleFriendsDetail>()
+						.eq("circle_friends_id",circleFriendsInfo.getId())
+						.eq("delete_flag",0)
+						.eq("interaction_flag","2"));
+				if(!CollectionUtils.isEmpty(circleFriendsDetailList1)){
+					circleFriendsInfo.setCircleFriendsDetailList1(circleFriendsDetailList1);
+					circleFriendsInfo.setCount(circleFriendsDetailList1.size());
+				}
+			}
+		}
 		Integer count = circleFriendsInfoMapper.selectCount(wrapper);
 		return new Page<CircleFriendsInfo>(list, page, limit, count);
 	}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CircleFriendsInfo.java

@@ -29,6 +29,11 @@ public class CircleFriendsInfo extends SuperDO {
     @TableId("id")
     private Long id;
 
+    /** 圈子id */
+    @Excel(name = "圈子id")
+    @TableField("circle_id")
+    private Long circleId;
+
     /** 朋友圈发布人id */
     @Excel(name = "朋友圈发布人id")
     @TableField("common_id")
@@ -54,6 +59,11 @@ public class CircleFriendsInfo extends SuperDO {
     @TableField("image")
     private String image;
 
+    /** 文件类型(1图片2视频) */
+    @Excel(name = "文件类型(1图片2视频)")
+    @TableField("media_type")
+    private String mediaType;
+
     /** 位置 */
     @Excel(name = "位置")
     @TableField("location")
@@ -85,6 +95,20 @@ public class CircleFriendsInfo extends SuperDO {
     private Long deleteFlag;
     @TableField(exist = false)
     private List<CircleFriendsDetail> circleFriendsDetailList;
+    @TableField(exist = false)
+    private List<CircleFriendsDetail> circleFriendsDetailList1;
+    //点赞数
+    @TableField(exist = false)
+    private Integer count;
+    //评论数
+    @TableField(exist = false)
+    private Integer count1;
+    //当前登录人id
+    @TableField(exist = false)
+    private Long currentCommonId;
+    //是否点赞标识
+    @TableField(exist = false)
+    private String helpFlag;
 
     @Override
     public String toString() {