From 3b6e1d829eff4e2120df68166e75532c1b6027fd Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 29 Oct 2020 14:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxmpMessageServiceImpl.java  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
index 0143d4a5b4..b555815d86 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
@@ -48,6 +48,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -352,8 +353,15 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         }
         List<GetTemplateListResultDTO> resultList = (List<GetTemplateListResultDTO>) mapToResult.getData();
         return resultList;
-        //List<CustomerTemplateListResultDTO> list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class);
-        //return list;
+        /*List<Object> resultList = (List<Object>) mapToResult.getData();
+        List<CustomerTemplateListResultDTO> list = new ArrayList<>();
+        //必须转换
+        for(Object f:resultList){
+            JSONObject json = JSON.parseObject(f.toString());
+            CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class);
+            list.add(ff);
+        }
+        return list;*/
     }
 
     /**
@@ -374,8 +382,14 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
             logger.error("调用epmet_third服务获取客户小程序消息订阅模板数据失败");
             throw new RenException(mapToResult.getCode());
         }
-        List<CustomerTemplateListResultDTO> resultList = (List<CustomerTemplateListResultDTO>) mapToResult.getData();
-        List<CustomerTemplateListResultDTO> list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class);
+        List<Object> resultList = (List<Object>) mapToResult.getData();
+        List<CustomerTemplateListResultDTO> list = new ArrayList<>();
+        //必须转换
+        for(Object f:resultList){
+            JSONObject json = JSON.parseObject(f.toString());
+            CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class);
+            list.add(ff);
+        }
         return list;
     }