奥体项目数据接口修改

@@ -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,6 +1430,7 @@ 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())){
+                    if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
                         EchartResult echartResult = new EchartResult();
                         EchartResult echartResult = new EchartResult();
                         echartResult.setName(time);
                         echartResult.setName(time);
                         echartResult.setValue(entry.getValue().toString());
                         echartResult.setValue(entry.getValue().toString());
@@ -1438,6 +1439,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
                     }
                     }
                 }
                 }
             }
             }
+        }
         List<Map<String, Object>> fDataList = factoryInfoService.queryReportData(AT_ID, fPgField, start, end, timeStep);
         List<Map<String, Object>> fDataList = factoryInfoService.queryReportData(AT_ID, fPgField, start, end, timeStep);
         for (Map<String, Object> bmap : fDataList) {
         for (Map<String, Object> bmap : fDataList) {
             String time = "";
             String time = "";
@@ -1448,6 +1450,7 @@ 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())){
+                    if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
                         EchartResult echartResult = new EchartResult();
                         EchartResult echartResult = new EchartResult();
                         echartResult.setName(time);
                         echartResult.setName(time);
                         echartResult.setValue(entry.getValue().toString());
                         echartResult.setValue(entry.getValue().toString());
@@ -1456,6 +1459,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
                     }
                     }
                 }
                 }
             }
             }
+        }
         map.put("pump", pumpList);
         map.put("pump", pumpList);
         map.put("flow", flowList);
         map.put("flow", flowList);
         return map;
         return map;
@@ -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";
         }
         }