From 1ec1d4b917029027b4d6af7d0b2db2f53de57d64 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 30 Nov 2017 22:06:48 +0800
Subject: [PATCH] 1

---
 .../platform/operate/web/controller/TempController.java  |  3 ++-
 .../com/lyms/platform/operate/web/facade/TempFacade.java | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java
index b74e733..8c8e793 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.Map;
 
 
 /**
@@ -81,7 +82,7 @@ public class TempController extends BaseController {
     @TokenRequired
     @RequestMapping(value = "/report/{id}",method = RequestMethod.GET)
     @ResponseBody
-    public BaseResponse report(@PathVariable String id,HttpServletRequest request){
+    public Map report(@PathVariable String id,HttpServletRequest request){
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return tempFacade.reportList(loginState.getId(),id);
     }
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 beaf638..65aabe3 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
@@ -167,25 +167,31 @@ public class TempFacade {
      * @param id     记录id
      * @return
      */
-    public BaseResponse reportList(Integer userId, String id) {
+    public Map reportList(Integer userId, String id) {
         TempModel tem = tempService.findOneById(id);
         Assert.notNull(tem, "查看的记录已被删除");
         LinkedHashMap<String, Double> data = tem.getTempList();
+        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 new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+            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);*/
         ;
-        List<String> time = new ArrayList<>();
-        List<String> temp=new ArrayList<>();
+
         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)));
         }
-        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+        return map;
     }
 }
\ No newline at end of file
-- 
1.8.3.1