新增 MR MS 控制图

ym-influx/src/main/java/com/cnbm/influx/Main.java

@@ -182,7 +182,7 @@ public class Main {
 
     private static List<FluxTable> query(QueryDataParam param,InfluxDBClient influxDBClient){
         String measurement = param.getMeasurement();
-        String dropedTagName = param.getDropedTagName();
+        List<String> dropedTagName = param.getDropedTagNames();
         Range range = param.getRange();
         String bucket = param.getBucket();
         String tagName = param.getTag().getTagName();
@@ -193,7 +193,9 @@ public class Main {
         flux += "|> range(start: "+range.getBegin().toString()+",stop:"+range.getEnd().toString()+")  \n";
         flux += "|> filter(fn: (r) => r[\"_measurement\"] == \""+measurement+"\")  \n";
         flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\")  \n";
-        flux += "|> drop(columns: [\""+dropedTagName+"\"])  \n";
+        for(String dropName:dropedTagName){
+            flux += "|> drop(columns: [\""+ dropName +"\"])  \n";
+        }
         flux += "|> sort(columns: [\"_time\"], desc: true) \n";
         if(pageInfo!=null){
             flux += "|> limit(n: "+pageInfo.getSize()+", offset: "+(pageInfo.getCurrent()-1)* pageInfo.getSize()+")";

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

@@ -78,6 +78,7 @@ public enum InfluxClient {
     public void insert(Event event, String measurement){
         Point point = Point.measurement(measurement)
                 .addTag("transationId", event.getTransationId())
+                .addTag("inspectionSheet", event.getInspectionSheet())
                 .addTag("argName", event.getArgName())
                 .addField("argValue", event.getArgValue())
                 .time(event.getTime().toEpochMilli(), WritePrecision.MS);
@@ -92,6 +93,7 @@ public enum InfluxClient {
         for(Event event:events){
             Point point = Point.measurement(measurement)
                     .addTag("transationId", event.getTransationId())
+                    .addTag("inspectionSheet", event.getInspectionSheet())
                     .addTag("argName", event.getArgName())
                     .addField("argValue", event.getArgValue())
                     .time(event.getTime().toEpochMilli(), WritePrecision.MS);
@@ -103,7 +105,7 @@ public enum InfluxClient {
 
     public List<FluxTable> query(QueryDataParam param){
         String measurement = param.getMeasurement();
-        String dropedTagName = param.getDropedTagName();
+        List<String> dropedTagNames = param.getDropedTagNames();
         Range range = param.getRange();
         String bucket = param.getBucket();
         String tagName = param.getTag().getTagName();
@@ -114,7 +116,9 @@ public enum InfluxClient {
         flux += "|> range(start: "+range.getBegin()+",stop:"+range.getEnd()+")";
         flux += "|> filter(fn: (r) => r[\"_measurement\"] == \""+measurement+"\")";
         flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\")";
-        flux += "|> drop(columns: [\""+dropedTagName+"\"])";
+        for(String dropName:dropedTagNames){
+            flux += "|> drop(columns: [\""+dropName+"\"])";
+        }
         flux += "|> sort(columns: [\"_time\"], desc: true)";
         if(pageInfo!=null){
             flux += "|> limit(n: "+pageInfo.getSize()+", offset: "+(pageInfo.getCurrent()-1)* pageInfo.getSize()+")";

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

@@ -32,7 +32,6 @@ public class S7DemoController {
         List<Event> list = new ArrayList<>();
         Random r = new Random();
 
-
         for(int i=0;i<999;i++){
             Thread.sleep(10);
             Event event = new Event();
@@ -46,6 +45,27 @@ public class S7DemoController {
         InfluxClient.Client.batchInsert(list,"Weight");
     }
 
+    @PostMapping("/insertBatchJYD")
+    public void insertBatchJYD() throws InterruptedException {
+        List<Event> list = new ArrayList<>();
+        Random r = new Random();
+
+        for(int j=0;j<10;j++){
+            for(int i=0;i<99;i++){
+                Thread.sleep(10);
+                Event event = new Event();
+                event.setTime(Instant.now());
+                event.setTransationId("asas"+i);
+                event.setArgName("LTWeight");
+                Double d = r.nextDouble() * 2.5  + 66;
+                event.setInspectionSheet(j+"");
+                event.setArgValue(d);
+                list.add(event);
+            }
+        }
+        InfluxClient.Client.batchInsert(list,"Weight");
+    }
+
     /**
      * 测试连接是否正常
      *
@@ -66,7 +86,10 @@ public class S7DemoController {
         QueryDataParam queryDataParam = new QueryDataParam();
         queryDataParam.setBucket("qgs-bucket");
         queryDataParam.setMeasurement("ASProcessCompleteEventAS");
-        queryDataParam.setDropedTagName("transationId");
+        List<String> dropNames = new ArrayList<>();
+        dropNames.add("transationId");
+        dropNames.add("inspectionSheet");
+        queryDataParam.setDropedTagNames(dropNames);
         queryDataParam.setTag(new Tag("argName","arg6"));
         queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(),Instant.now()));
         queryDataParam.setPageInfo(new PageInfo(1,10));
@@ -89,7 +112,10 @@ public class S7DemoController {
         QueryDataParam queryDataParam = new QueryDataParam();
         queryDataParam.setBucket("qgs-bucket");
         queryDataParam.setMeasurement("ASProcessCompleteEventAS");
-        queryDataParam.setDropedTagName("transationId");
+        List<String> dropNames = new ArrayList<>();
+        dropNames.add("transationId");
+        dropNames.add("inspectionSheet");
+        queryDataParam.setDropedTagNames(dropNames);
         queryDataParam.setTag(new Tag("argName","arg7"));
         queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(),Instant.now()));
         queryDataParam.setPageInfo(new PageInfo(2,10));

ym-influx/src/main/java/com/cnbm/influx/param/QueryDataParam.java

@@ -4,6 +4,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @Desc: "influx 查询条件构造"
  * @Author: caixiang
@@ -25,7 +27,7 @@ import lombok.experimental.Accessors;
 public class QueryDataParam extends BaseParam{
     private Tag tag;
     //查询的时候，需要忽略的字段。(transationId是唯一标识会对 最终的查询结果集产生影响)
-    private String dropedTagName;
+    private List<String> dropedTagNames;
     private String bucket;
 
 }

ym-influx/src/main/java/com/cnbm/influx/template/Event.java

@@ -14,11 +14,14 @@ import java.time.Instant;
  */
 @Data
 public class Event {
+
     private Instant time;
 
+    private String inspectionSheet;
+
     private String transationId;
 
     private String argName;
 
     private Double argValue;
-}
+}