Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang

ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java

@@ -124,10 +124,11 @@ public enum InfluxClient {
             }else {
                 point = Point.measurement(measurement)
                         .addTag("transationId", event.getTransationId())
-
                         .addTag("inspectionSheetId", event.getInspectionSheetId())
+
+//                        .addTag("batchNum", event.getBatchNum())
                         .addTag("sampleNumber", event.getSampleNumber())
-                        .addTag("batchNum", event.getBatchNum())
+                        .addField("batchNum", event.getBatchNum())
 
                         .addTag("argName", event.getArgName())
                         .addField("argValue", event.getArgValue())
@@ -146,9 +147,6 @@ public enum InfluxClient {
         List<String> dropedTagNames = param.getDropedTagNames();
         Range range = param.getRange();
         String bucket = param.getBucket();
-
-
-
         PageInfo pageInfo = param.getPageInfo();
 
         String flux = "from(bucket:\""+bucket+"\")";
@@ -162,7 +160,9 @@ public enum InfluxClient {
         }
 
         //调整时区，查询出的结果 +8个小时
-        flux += "|> timeShift(duration: 8h)";
+        //flux += "|> timeShift(duration: 8h)";
+
+
         for(String dropName:dropedTagNames){
             flux += "|> drop(columns: [\""+dropName+"\"])";
         }

ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java

@@ -53,6 +53,31 @@ public class S7DemoController {
         InfluxClient.Client.batchInsert(list,"Weight");
     }
 
+    @PostMapping("/insertDemoOne")
+    public void insertDemoOne() throws InterruptedException {
+        List<Event> list = new ArrayList<>();
+        Random r = new Random();
+        Thread.sleep(10);
+        Instant time = new Date().toInstant();
+        Event event = new Event();
+        event.setTime(time);
+        event.setTransationId("asas123");
+        event.setArgName("failDayDay");
+        event.setArgValue("1");
+        list.add(event);
+
+        Thread.sleep(1000);
+
+        Event event2 = new Event();
+        event2.setTime(time);
+        event2.setTransationId("asas456");
+        event2.setArgName("failDayDay");
+        event2.setArgValue("2");
+        list.add(event2);
+
+        InfluxClient.Client.batchInsert(list,"Weight");
+    }
+
 
     //for 常规计数型
     @PostMapping("/insertDemoDataForCount")