From e3284402004fc3e376083094607f9c293165f491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Fri, 21 Jul 2017 16:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/helper/LiveRoomHelper.java | 10 +++++-----
 src/main/java/com/ifish/util/IfishUtil.java        | 10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ifish/helper/LiveRoomHelper.java b/src/main/java/com/ifish/helper/LiveRoomHelper.java
index 42bd7d0..007438f 100644
--- a/src/main/java/com/ifish/helper/LiveRoomHelper.java
+++ b/src/main/java/com/ifish/helper/LiveRoomHelper.java
@@ -7,6 +7,7 @@ package com.ifish.helper;
 
 import com.ifish.Interceptor.IfishException;
 import com.ifish.bean.LiveRoomPageInfo;
+import com.ifish.bean.PageResult;
 import com.ifish.bean.Tbl_Device_User;
 import com.ifish.bean.Tbl_Live_Message;
 import com.ifish.bean.Tbl_Live_Room;
@@ -362,7 +363,6 @@ public class LiveRoomHelper implements LiveRoomHelperI {
 
         try {
             if (firstResult != null && pageSize != null) {
-                Map<String, Object> returnMap = new HashMap<String, Object>();
                 List<LiveRoomPageInfo> timeList = new ArrayList<LiveRoomPageInfo>();
                 String key = redisKeyHelperI.getListTbl_Live_Room_RedisKey(firstResult, pageSize, orders);
                 String redisString = redisHelperI.getRedis(key);
@@ -388,10 +388,10 @@ public class LiveRoomHelper implements LiveRoomHelperI {
                     count = tbl_Live_Room_Mapper.getLiveRoomListCount();
                     redisHelperI.setRedis(key, count.toString());
                 }
-                returnMap.put("orders", orders);
-                returnMap.put("total", count);
-                returnMap.put("liveRoomInfo", timeList);
-                return IfishUtil.toJson(ResultEnum.success.getKey(), returnMap);
+                PageResult page = new PageResult();
+                page.setList(timeList);
+                page.setTotalCount(count);
+                return IfishUtil.returnPageData(page, ResultEnum.success.getKey());
             }
             return IfishUtil.toJson(ResultEnum.fail101.getKey(), "");
         } catch (Exception e) {
diff --git a/src/main/java/com/ifish/util/IfishUtil.java b/src/main/java/com/ifish/util/IfishUtil.java
index b515c0e..bb15855 100644
--- a/src/main/java/com/ifish/util/IfishUtil.java
+++ b/src/main/java/com/ifish/util/IfishUtil.java
@@ -15,6 +15,7 @@ import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -309,6 +310,7 @@ public class IfishUtil {
     public static Map<String, Object> toJson(String key, Object value) {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("result", key);
+        List<Object> list = null;
         if (value.equals("")) {
             map.put("data", null);
         } else {
@@ -318,6 +320,14 @@ public class IfishUtil {
                     map.put("total", map1.get("total"));
                     map1.remove("total");
                 }
+                if (map1.get("orders") != null && StringUtils.isNotBlank(map1.get("orders").toString())) {
+                    map.put("orders", map1.get("orders"));
+                    map1.remove("orders");
+                }
+                if (map1.get("list") != null && StringUtils.isNotBlank(map1.get("list").toString())) {
+                    list = (List<Object>) map1.get("list");
+                    map1.remove("list");
+                }
             }
             map.put("data", value);
         }