Merge remote-tracking branch 'origin/master'

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/DataDiagnoseService.java

@@ -146,14 +146,6 @@ public class DataDiagnoseService {
             }
             try {
                 List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getUniformcode(), di.getStartTs(), di.getEndTs(), di.getThingId());
-                long st = Long.valueOf(di.getStartTs());
-                long et = Long.valueOf(di.getEndTs());
-                if (pds.size() == 0){
-                    for (long i = st; i <= et; i++){
-                        PointData obj = new PointData();
-                        pds.add(obj);
-                    }
-                }
                 pairs.put(key, pds);
             } catch (Exception e) {
                 e.printStackTrace();

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/DataPredictService.java

@@ -149,14 +149,6 @@ public class DataPredictService {
             }
             try {
                 List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getUniformcode(), di.getStartTs(), di.getEndTs(), di.getThingId());
-                long st = Long.valueOf(di.getStartTs());
-                long et = Long.valueOf(di.getEndTs());
-                if (pds.size() == 0){
-                    for (long i = st; i <= et; i++){
-                        PointData obj = new PointData();
-                        pds.add(obj);
-                    }
-                }
                 pairs.put(key, pds);
             } catch (Exception e) {
                 e.printStackTrace();