From bd6a50f68770328475d62231569533e30e771049 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 19 Jul 2021 17:11:07 +0800
Subject: [PATCH] =?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<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);
     }
 
     /**