From 44a8c88d91638a868fa735db094b08b13e6ece8c Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 19 Jul 2021 16:57:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=8B=B7=E8=B4=9D?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/redis/TagRedis.java | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java index fcf736da02..f132d2f518 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java @@ -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> typedTuples = redisUtils.zReverseRangeWithScores(customerKey, start, end); for (CorrelationTagListResultDTO correlationTagList : resultList) { for (ZSetOperations.TypedTuple 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 result = new ArrayList(); for (Object object : objects) { - result.add(objectToDTO(object,TagInfoResultDTO.class)); + result.add(ConvertUtils.sourceToTarget(object,TagInfoResultDTO.class)); } // List tagInfoResultDTOS = JSONObject.parseArray(objects.toString(), TagInfoResultDTO.class); return result; @@ -173,7 +173,7 @@ public class TagRedis { } List result = new ArrayList(); 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> typedTuples = redisUtils.zReverseRangeWithScores(gridTagKey, start, end); for (TagInfoResultDTO tagInfo : resultList) { for (ZSetOperations.TypedTuple 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 objectToDTO(Object o,Class tClass){ - ObjectMapper objectMapper = new ObjectMapper(); - T t = objectMapper.convertValue(o, tClass); - return t; - } - /** * @Description 更新标签使用次数 * @param key From bd6a50f68770328475d62231569533e30e771049 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 19 Jul 2021 17:11:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?tag=E6=A0=87=E7=AD=BE=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E6=8B=B7=E8=B4=9D=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/redis/TagRedis.java | 39 +++---------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java index f132d2f518..45a3548367 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/redis/TagRedis.java @@ -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 resultEquals = new ArrayList<>(); @@ -127,13 +123,7 @@ public class TagRedis { } // 根据标签使用顺序倒叙 List collect = resultEquals.stream().sorted(Comparator.comparing(TagRankResultDTO::getScore).reversed()).collect(Collectors.toList()); - List 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 result = new ArrayList(); - for (Object object : objects) { - result.add(ConvertUtils.sourceToTarget(object,TagInfoResultDTO.class)); - } -// List 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 result = new ArrayList(); - 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 resultEquals = new ArrayList<>(); @@ -231,13 +210,7 @@ public class TagRedis { } // 根据标签使用顺序倒叙 List collect = resultEquals.stream().sorted(Comparator.comparing(TagRankResultDTO::getScore).reversed()).collect(Collectors.toList()); - List 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); } /**