From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/ScreenController.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 05b8a46..65924e7 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -727,7 +727,7 @@
              */
             /*������������start-------------------------------------------------------------------------*/
             list.remove(0);
-            if (list.size() == 23) {
+            //if (list.size() == 23) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
                 //���������������������yyyy-MM-dd HH:mm:ss
@@ -745,7 +745,7 @@
                     datas.put("time",time1);
                     list.add(datas);
                 }
-            }
+            //}
             /*������������end-------------------------------------------------------------------------*/
 
 
@@ -2963,25 +2963,25 @@
             rList.add(null);
         }else {
             for (int j = 0; j < lists.get(0).size(); j++) {
-                Map<String,Object> listMap = new HashMap();
-                List<Map> mapList=new ArrayList<>();
-                if (lists.get(0).size()==1){
+                Map<String, Object> listMap = new HashMap();
+                List<Map> mapList = new ArrayList<>();
+                if (lists.get(0).size() == 1) {
                     mapList.add(null);
-                }else {
+                } else {
                     mapList.add((Map) lists.get(0).get(j).get("data"));
                 }
-                    for (int i = 1; i < lists.size(); i++) {
-                        if (lists.get(i).size()==1){
-                            mapList.add(null);
-                            listMap.put("data",mapList);
-                        }else {
-                            if (lists.get(0).get(j).get("time").equals(lists.get(i).get(j).get("time"))){
-                                mapList.add((Map) lists.get(i).get(j).get("data"));
-                            }
-                            listMap.put("time",lists.get(0).get(j).get("time"));
-                            listMap.put("data",mapList);
+                for (int i = 1; i < lists.size(); i++) {
+                    if (lists.get(i).size() == 1) {
+                        mapList.add(null);
+                        listMap.put("data", mapList);
+                    } else {
+                        if (lists.get(0).get(j).get("time").equals(lists.get(i).get(j).get("time"))) {
+                            mapList.add((Map) lists.get(i).get(j).get("data"));
                         }
+                        listMap.put("time", lists.get(0).get(j).get("time"));
+                        listMap.put("data", mapList);
                     }
+                }
                 rList.add(listMap);
             }
         }

--
Gitblit v1.8.0