1.fix collect status when check others

luoo_music/src/main/java/com/luoo/music/controller/JournalController.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import com.luoo.music.pojo.Journal;
 import com.luoo.music.pojo.Tag;
@@ -135,12 +136,23 @@ public class JournalController {
 			return Result.success(new PageResult<JournalRespDTO>(0L, Collections.emptyList()));
 		}
 		List<Journal> pageList = journalService.orderByField(objectIds);
-		Set<String> journalCollectSet =  new HashSet<>(objectIds);
+		UserLoginDto user = jwtUtil.getUserLoginDto(authorization);
+		Set<String> journalCollectSet =  getMyCollectSet(user.getUserId(),queryReq.getUserId(),objectIds);
 		List<JournalRespDTO> list = pageList.stream().map(a -> JournalMapper.getJournalRespDTO(a, journalCollectSet))
 				.collect(Collectors.toList());
 		return Result.success(new PageResult<JournalRespDTO>(Long.valueOf(list.size()), list));
 	}
 	
+	private Set<String> getMyCollectSet(String loginUser, String checkUser, List<String> objectIds) {
+		if(loginUser.equals(checkUser)) {
+			return new HashSet<>(objectIds);
+		}
+		List<String> myObjectIds=userCollectInfoService.findByUserIdAndCollectTypeAndObjectIdIn(loginUser,CollectTypeEnum.JOURNAL,objectIds);
+		if(CollectionUtils.isEmpty(myObjectIds)) {
+			return Collections.emptySet();
+		}
+		return new HashSet<>(myObjectIds);
+	}
 	private List<String> getObjectIds(CollectQueryReq queryReq) {
 		if(null==queryReq.getPageNum()||queryReq.getPageNum()<1||null==queryReq.getPageSize()||queryReq.getPageSize()<1) {
 			return userCollectInfoService.findByUserIdAndCollectType(queryReq.getUserId(), CollectTypeEnum.JOURNAL);

luoo_music/src/main/java/com/luoo/music/controller/SongController.java

@@ -25,6 +25,7 @@ import util.JwtUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Collections;
@@ -94,12 +95,22 @@ public class SongController {
 		}
 		List<SongInfo> songs = songInfoService.orderByField(objectIds);
 		
-		Set<String> songCollectSet = new HashSet<>(objectIds);
+		UserLoginDto user = jwtUtil.getUserLoginDto(authorization);
+		Set<String> songCollectSet =  getMyCollectSet(user.getUserId(),queryReq.getUserId(),objectIds);
 		List<SongRespDTO> results = songs.stream().map(s -> SongMapper.getSongRespDTO(s, songCollectSet))
 				.collect(Collectors.toList());
 		return Result.success(new PageResult<SongRespDTO>(Long.valueOf(results.size()), results));
 	}
-	
+	private Set<String> getMyCollectSet(String loginUser, String checkUser, List<String> objectIds) {
+		if(loginUser.equals(checkUser)) {
+			return new HashSet<>(objectIds);
+		}
+		List<String> myObjectIds=userCollectInfoService.findByUserIdAndCollectTypeAndObjectIdIn(loginUser,CollectTypeEnum.SONG,objectIds);
+		if(CollectionUtils.isEmpty(myObjectIds)) {
+			return Collections.emptySet();
+		}
+		return new HashSet<>(myObjectIds);
+	}
 	private List<String> getSongIds(CollectQueryReq queryReq) {
 		if(null==queryReq.getPageNum()||queryReq.getPageNum()<1||null==queryReq.getPageSize()||queryReq.getPageSize()<1) {
 			return userCollectInfoService.findByUserIdAndCollectType(queryReq.getUserId(), CollectTypeEnum.SONG);

luoo_music/src/main/java/com/luoo/music/dao/UserCollectInfoDao.java

@@ -1,6 +1,5 @@
 package com.luoo.music.dao;
 
-
 import java.util.List;
 
 import org.springframework.data.domain.Pageable;
@@ -11,5 +10,9 @@ import com.luoo.music.pojo.UserCollectInfo;
 public interface UserCollectInfoDao extends MongoRepository<UserCollectInfo, String> {
 	List<UserCollectInfo> findByUserIdAndCollectTypeOrderByCreateTimeDesc(String userId, Integer collectType,
 			Pageable pageable);
+
 	List<UserCollectInfo> findByUserIdAndCollectTypeOrderByCreateTimeDesc(String userId, Integer collectType);
+
+	List<UserCollectInfo> findByUserIdAndCollectTypeAndObjectIdIn(String userId, Integer collectType,
+			List<String> objectIds);
 }

luoo_music/src/main/java/com/luoo/music/service/UserCollectInfoService.java

@@ -56,4 +56,10 @@ public class UserCollectInfoService {
 		return userCollectInfoDao.findByUserIdAndCollectTypeOrderByCreateTimeDesc(userId,
 				collectTypeEnum.getType()).stream().map(UserCollectInfo::getObjectId).collect(Collectors.toList());
 	}
+
+	public List<String> findByUserIdAndCollectTypeAndObjectIdIn(String userId, CollectTypeEnum collectTypeEnum,
+			List<String> objectIds) {
+		return userCollectInfoDao.findByUserIdAndCollectTypeAndObjectIdIn(userId,
+				collectTypeEnum.getType(),objectIds).stream().map(UserCollectInfo::getObjectId).collect(Collectors.toList());
+	}
 }