|
|
@ -21,6 +21,7 @@ import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
|
import com.epmet.commons.tools.redis.RedisKeys; |
|
|
|
import com.epmet.commons.tools.redis.RedisUtils; |
|
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
|
import com.epmet.constant.TagConstant; |
|
|
|
import com.epmet.dto.form.CorrelationTagListFormDTO; |
|
|
|
import com.epmet.dto.form.TagCascadeListFormDTO; |
|
|
@ -28,7 +29,6 @@ import com.epmet.dto.result.CorrelationTagListResultDTO; |
|
|
|
import com.epmet.dto.result.TagInfoResultDTO; |
|
|
|
import com.epmet.dto.result.TagRankResultDTO; |
|
|
|
import com.epmet.dto.result.UpdateTagUseCountsResultDTO; |
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
@ -104,7 +104,7 @@ public class TagRedis { |
|
|
|
} |
|
|
|
//转换DTO
|
|
|
|
for (Object object : objects) { |
|
|
|
resultList.add(objectToDTO(object,CorrelationTagListResultDTO.class)); |
|
|
|
resultList.add(ConvertUtils.sourceToTarget(object,CorrelationTagListResultDTO.class)); |
|
|
|
} |
|
|
|
// resultList = JSONObject.parseArray(objects.toString(), CorrelationTagListResultDTO.class);
|
|
|
|
//级联标签排序
|
|
|
@ -117,7 +117,7 @@ public class TagRedis { |
|
|
|
Set<ZSetOperations.TypedTuple<Object>> typedTuples = redisUtils.zReverseRangeWithScores(customerKey, start, end); |
|
|
|
for (CorrelationTagListResultDTO correlationTagList : resultList) { |
|
|
|
for (ZSetOperations.TypedTuple<Object> typedTuple : typedTuples) { |
|
|
|
TagRankResultDTO tagRank = objectToDTO(typedTuple.getValue(), TagRankResultDTO.class); |
|
|
|
TagRankResultDTO tagRank = ConvertUtils.sourceToTarget(typedTuple.getValue(), TagRankResultDTO.class); |
|
|
|
tagRank.setScore(typedTuple.getScore()); |
|
|
|
if (correlationTagList.getTagId().equals(tagRank.getTagId())){ |
|
|
|
resultEquals.add(tagRank); |
|
|
@ -152,7 +152,7 @@ public class TagRedis { |
|
|
|
} |
|
|
|
List<TagInfoResultDTO> result = new ArrayList<TagInfoResultDTO>(); |
|
|
|
for (Object object : objects) { |
|
|
|
result.add(objectToDTO(object,TagInfoResultDTO.class)); |
|
|
|
result.add(ConvertUtils.sourceToTarget(object,TagInfoResultDTO.class)); |
|
|
|
} |
|
|
|
// List<TagInfoResultDTO> tagInfoResultDTOS = JSONObject.parseArray(objects.toString(), TagInfoResultDTO.class);
|
|
|
|
return result; |
|
|
@ -173,7 +173,7 @@ public class TagRedis { |
|
|
|
} |
|
|
|
List<TagInfoResultDTO> result = new ArrayList<TagInfoResultDTO>(); |
|
|
|
for (Object object : objects) { |
|
|
|
result.add(objectToDTO(object,TagInfoResultDTO.class)); |
|
|
|
result.add(ConvertUtils.sourceToTarget(object,TagInfoResultDTO.class)); |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
@ -208,7 +208,7 @@ public class TagRedis { |
|
|
|
} |
|
|
|
//转换DTO
|
|
|
|
for (Object object : objects) { |
|
|
|
resultList.add(objectToDTO(object, TagInfoResultDTO.class)); |
|
|
|
resultList.add(ConvertUtils.sourceToTarget(object, TagInfoResultDTO.class)); |
|
|
|
} |
|
|
|
//级联标签排序
|
|
|
|
//1.取出 zset 中的有序标签,根据级联标签,筛选有序标签
|
|
|
@ -221,7 +221,7 @@ public class TagRedis { |
|
|
|
Set<ZSetOperations.TypedTuple<Object>> typedTuples = redisUtils.zReverseRangeWithScores(gridTagKey, start, end); |
|
|
|
for (TagInfoResultDTO tagInfo : resultList) { |
|
|
|
for (ZSetOperations.TypedTuple<Object> typedTuple : typedTuples) { |
|
|
|
TagRankResultDTO tagRank = objectToDTO(typedTuple.getValue(), TagRankResultDTO.class); |
|
|
|
TagRankResultDTO tagRank = ConvertUtils.sourceToTarget(typedTuple.getValue(), TagRankResultDTO.class); |
|
|
|
tagRank.setScore(typedTuple.getScore()); |
|
|
|
if (tagInfo.getTagId().equals(tagRank.getTagId())){ |
|
|
|
resultEquals.add(tagRank); |
|
|
@ -240,18 +240,6 @@ public class TagRedis { |
|
|
|
return tagInfoResultList; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description Object 转换 DTO |
|
|
|
* @param o |
|
|
|
* @param tClass |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
public <T> T objectToDTO(Object o,Class<T> tClass){ |
|
|
|
ObjectMapper objectMapper = new ObjectMapper(); |
|
|
|
T t = objectMapper.convertValue(o, tClass); |
|
|
|
return t; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 更新标签使用次数 |
|
|
|
* @param key |
|
|
|