Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/taos

redisread/src/main/java/com/gyee/redisread/service/ReadRedisService.java

@@ -78,7 +78,7 @@ public class ReadRedisService implements ApplicationRunner {
         keys.forEach(k -> {
             if (k.contains("DI") || k.contains("di")) {
                 dikeys.add(k);
-            } else {
+            } else if (k.contains("AI") || k.contains("ai")) {
                 aikeys.add(k);
             }
         });

redisread/src/main/java/com/gyee/redisread/task/TaskRedisRead.java

@@ -106,7 +106,12 @@ public class TaskRedisRead implements Runnable {
 
             /*if ("bool".equals(dataType)) {
                 for (int i = 0; i < objects.size(); i++) {
-                    response = (List<String>) objects.get(i);
+                    try {
+                        response = (List<String>) objects.get(i);
+                    }catch (Exception e){
+                        log.error(objects.get(i).toString());
+                        continue;
+                    }
 
                     value = response.get(1);
                     if (value == null || "".equals(value) || value.contains("-nan")) continue;
@@ -118,8 +123,13 @@ public class TaskRedisRead implements Runnable {
                     if (ChangedSave.map.containsKey(pointid)) {
                         if (!Objects.equals(ChangedSave.map.get(pointid), datetime)) {
                             ChangedSave.map.put(pointid, datetime);
-                            ts = Long.valueOf(datetime) * 1000;
-                            bl = Double.valueOf(value) == 1;
+                            ts = datetime.length()>10?Long.valueOf(datetime): Long.valueOf(datetime)* 1000;
+                            try{
+                                bl = Double.parseDouble(value) == 1;
+                            }catch (Exception e){
+                                log.warn(value);
+                                continue;
+                            }
                             //j++;
                             sb.append(pointid).append(" VALUES (").append(ts).append(",").append(bl).append(") ");
                         }
@@ -137,10 +147,14 @@ public class TaskRedisRead implements Runnable {
                 }
             } else {
                 for (int i = 0; i < objects.size(); i++) {
-                    response = (List<String>) objects.get(i);
+                    try {
+                        response = (List<String>) objects.get(i);
+                    }catch (Exception e){
+                        log.error(objects.get(i).toString());
+                        continue;
+                    }
 
                     value = response.get(1);
-                    if (value == null || "".equals(value) || value.contains("-nan")) continue;
                     datetime = response.get(2);
                     if (StringUtils.isEmpty(datetime)) continue;
                     pointid = response.get(0);
@@ -149,9 +163,14 @@ public class TaskRedisRead implements Runnable {
                     if (ChangedSave.map.containsKey(pointid)) {
                         if (!Objects.equals(ChangedSave.map.get(pointid), datetime)) {
                             ChangedSave.map.put(pointid, datetime);
-                            ts = Long.valueOf(datetime) * 1000;
-                            val = Double.valueOf(value);
-
+                            ts = datetime.length()>10?Long.valueOf(datetime): Long.valueOf(datetime)* 1000;
+                            try{
+                                val = Double.parseDouble(value);
+                                if (Double.isNaN(val) || Double.isInfinite(val)) continue;
+                            }catch (Exception e){
+                                log.warn(value);
+                                continue;
+                            }
                             //j++;
                             sb.append(pointid).append(" VALUES (").append(ts).append(",").append(val).append(") ");
                         }