奥体项目数据接口修改

@@ -1397,8 +1397,8 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             end = endDate + " 23:59:59";
             end = endDate + " 23:59:59";
         }else if("custom".equals(timeType)){
         }else if("custom".equals(timeType)){
             timeStep = "day";
             timeStep = "day";
-            start = inputQueryParams.getStart();
-            end = inputQueryParams.getEnd();
+            start = inputQueryParams.getStart()+ " 00:00:00";
+            end = inputQueryParams.getEnd() + " 23:59:59";
         }else {
         }else {
             timeStep = "day";
             timeStep = "day";
         }
         }
@@ -1430,11 +1430,13 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             }
             }
             for (Map.Entry<String, Object> entry : bmap.entrySet()) {
             for (Map.Entry<String, Object> entry : bmap.entrySet()) {
                 if(!"time".equals(entry.getKey())){
                 if(!"time".equals(entry.getKey())){
-                    EchartResult echartResult = new EchartResult();
-                    echartResult.setName(time);
-                    echartResult.setValue(entry.getValue().toString());
-                    echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
-                    pumpList.add(echartResult);
+                    if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
+                        EchartResult echartResult = new EchartResult();
+                        echartResult.setName(time);
+                        echartResult.setValue(entry.getValue().toString());
+                        echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
+                        pumpList.add(echartResult);
+                    }
                 }
                 }
             }
             }
         }
         }
@@ -1448,11 +1450,13 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             }
             }
             for (Map.Entry<String, Object> entry : bmap.entrySet()) {
             for (Map.Entry<String, Object> entry : bmap.entrySet()) {
                 if(!"time".equals(entry.getKey())){
                 if(!"time".equals(entry.getKey())){
-                    EchartResult echartResult = new EchartResult();
-                    echartResult.setName(time);
-                    echartResult.setValue(entry.getValue().toString());
-                    echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
-                    flowList.add(echartResult);
+                    if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
+                        EchartResult echartResult = new EchartResult();
+                        echartResult.setName(time);
+                        echartResult.setValue(entry.getValue().toString());
+                        echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
+                        flowList.add(echartResult);
+                    }
                 }
                 }
             }
             }
         }
         }
@@ -1500,8 +1504,8 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             end = endDate + " 23:59:59";
             end = endDate + " 23:59:59";
         }else if("custom".equals(timeType)){
         }else if("custom".equals(timeType)){
             timeStep = "day";
             timeStep = "day";
-            start = inputQueryParams.getStart();
-            end = inputQueryParams.getEnd();
+            start = inputQueryParams.getStart()+ " 00:00:00";
+            end = inputQueryParams.getEnd() + " 23:59:59";
         }else {
         }else {
             timeStep = "day";
             timeStep = "day";
         }
         }