From fe1cac93eb80fc2f8d1c060d6073f6105bc0f6ec Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 14 Dec 2017 14:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AD=95=E5=A6=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=85=A7=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/TempFacade.java    | 39 ++++++++++++----------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
index 925edb3..b173076 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
@@ -200,30 +200,33 @@ public class TempFacade {
      * @return
      */
     public Map reportList(Integer userId, String id) {
-        TempModel tem = tempService.findOneById(id);
+        TempQuery tempQuery = new TempQuery();
+        tempQuery.setpIds(Arrays.asList(new String[]{id}));
+        List<TempModel> tem = tempService.queryTemp(tempQuery);
         Assert.notNull(tem, "查看的记录已被删除");
-        LinkedHashMap<String, Double> data = tem.getTempList();
+        List<String> time = new ArrayList<>();
+        List<String> temp1 = new ArrayList<>();
         Map map = new HashMap();
         map.put("errorcode", ErrorCodeConstants.SUCCESS);
         map.put("errormsg", "成功");
-        List<String> time = new ArrayList<>();
-        List<String> temp = new ArrayList<>();
-        map.put("time", time);
-        map.put("temp", temp);
-        if (null == data || data.isEmpty()) {
-            return map;
-        }
-    /*    Set<Map.Entry<String, Double>> set = data.entrySet();
-
-        ArrayList<Map.Entry<String, Double>> da = new ArrayList<Map.Entry<String, Double>>(set);
-        Collections.reverse(da);*/
-        ;
+        if (CollectionUtils.isNotEmpty(tem)) {
+            LinkedHashMap<String, Double> data1=new LinkedHashMap<>();
+            for (TempModel temp : tem) {
+                LinkedHashMap<String, Double> data = temp.getTempList();
+                if (null == data || data.isEmpty()) {
+                    continue;
+                }
+                data1.putAll(temp.getTempList());
+            }
 
-        for (int i = 0; i < 7; i++) {
-            String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i));
-            time.add(t);
-            temp.add(String.valueOf(data.get(t)));
+            for (int i = 0; i < 7; i++) {
+                String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i));
+                time.add(t);
+                temp1.add(String.valueOf(data1.get(t)));
+            }
         }
+        map.put("time", time);
+        map.put("temp", temp1);
         return map;
     }
 
-- 
1.8.3.1