|
|
@ -30,7 +30,6 @@ import com.epmet.dto.result.TagInfoResultDTO; |
|
|
|
import com.epmet.dto.result.TagRankResultDTO; |
|
|
|
import com.epmet.dto.result.UpdateTagUseCountsResultDTO; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.dao.DataAccessException; |
|
|
|
import org.springframework.data.redis.connection.RedisConnection; |
|
|
@ -103,10 +102,7 @@ public class TagRedis { |
|
|
|
return resultList; |
|
|
|
} |
|
|
|
//转换DTO
|
|
|
|
for (Object object : objects) { |
|
|
|
resultList.add(ConvertUtils.sourceToTarget(object,CorrelationTagListResultDTO.class)); |
|
|
|
} |
|
|
|
// resultList = JSONObject.parseArray(objects.toString(), CorrelationTagListResultDTO.class);
|
|
|
|
resultList = ConvertUtils.sourceToTarget(objects,CorrelationTagListResultDTO.class); |
|
|
|
//级联标签排序
|
|
|
|
//1.取出 zset 中的有序标签,根据级联标签,筛选有序标签
|
|
|
|
List<TagRankResultDTO> resultEquals = new ArrayList<>(); |
|
|
@ -127,13 +123,7 @@ public class TagRedis { |
|
|
|
} |
|
|
|
// 根据标签使用顺序倒叙
|
|
|
|
List<TagRankResultDTO> collect = resultEquals.stream().sorted(Comparator.comparing(TagRankResultDTO::getScore).reversed()).collect(Collectors.toList()); |
|
|
|
List<CorrelationTagListResultDTO> realResult = new ArrayList<>(); |
|
|
|
for (TagRankResultDTO tagRankResultDTO : collect) { |
|
|
|
CorrelationTagListResultDTO correlation = new CorrelationTagListResultDTO(); |
|
|
|
BeanUtils.copyProperties(tagRankResultDTO,correlation); |
|
|
|
realResult.add(correlation); |
|
|
|
} |
|
|
|
return realResult; |
|
|
|
return ConvertUtils.sourceToTarget(collect, CorrelationTagListResultDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -150,12 +140,7 @@ public class TagRedis { |
|
|
|
if (objects.size()== NumConstant.ZERO){ |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
List<TagInfoResultDTO> result = new ArrayList<TagInfoResultDTO>(); |
|
|
|
for (Object object : objects) { |
|
|
|
result.add(ConvertUtils.sourceToTarget(object,TagInfoResultDTO.class)); |
|
|
|
} |
|
|
|
// List<TagInfoResultDTO> tagInfoResultDTOS = JSONObject.parseArray(objects.toString(), TagInfoResultDTO.class);
|
|
|
|
return result; |
|
|
|
return ConvertUtils.sourceToTarget(objects, TagInfoResultDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
@ -171,11 +156,7 @@ public class TagRedis { |
|
|
|
if (objects.size()== NumConstant.ZERO){ |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
List<TagInfoResultDTO> result = new ArrayList<TagInfoResultDTO>(); |
|
|
|
for (Object object : objects) { |
|
|
|
result.add(ConvertUtils.sourceToTarget(object,TagInfoResultDTO.class)); |
|
|
|
} |
|
|
|
return result; |
|
|
|
return ConvertUtils.sourceToTarget(objects, TagInfoResultDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
@ -207,9 +188,7 @@ public class TagRedis { |
|
|
|
return resultList; |
|
|
|
} |
|
|
|
//转换DTO
|
|
|
|
for (Object object : objects) { |
|
|
|
resultList.add(ConvertUtils.sourceToTarget(object, TagInfoResultDTO.class)); |
|
|
|
} |
|
|
|
resultList = ConvertUtils.sourceToTarget(objects,TagInfoResultDTO.class); |
|
|
|
//级联标签排序
|
|
|
|
//1.取出 zset 中的有序标签,根据级联标签,筛选有序标签
|
|
|
|
List<TagRankResultDTO> resultEquals = new ArrayList<>(); |
|
|
@ -231,13 +210,7 @@ public class TagRedis { |
|
|
|
} |
|
|
|
// 根据标签使用顺序倒叙
|
|
|
|
List<TagRankResultDTO> collect = resultEquals.stream().sorted(Comparator.comparing(TagRankResultDTO::getScore).reversed()).collect(Collectors.toList()); |
|
|
|
List<TagInfoResultDTO> tagInfoResultList = new ArrayList<>(); |
|
|
|
for (TagRankResultDTO tagRankResultDTO : collect) { |
|
|
|
TagInfoResultDTO tagInfoResult = new TagInfoResultDTO(); |
|
|
|
BeanUtils.copyProperties(tagRankResultDTO,tagInfoResult); |
|
|
|
tagInfoResultList.add(tagInfoResult); |
|
|
|
} |
|
|
|
return tagInfoResultList; |
|
|
|
return ConvertUtils.sourceToTarget(collect, TagInfoResultDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|