From 8a3a037bdafe3c0c6b1a0786c41d618aa047a8f9 Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Fri, 29 Jul 2022 10:38:43 +0800 Subject: [PATCH] mark --- .../src/main/java/com/cnbm/influx/config/InfluxClient.java | 4 ++-- .../java/com/cnbm/influx/controller/S7DemoController.java | 6 +++--- ym-influx/src/main/java/com/cnbm/influx/template/Event.java | 2 +- .../cnbm/processInspection/graphAnalyzed/mr/MeanRGraph.java | 2 +- .../graphAnalyzed/ms/MeanStandardDeviationGraph.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java b/ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java index c0c5183..bc14755 100644 --- a/ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java +++ b/ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java @@ -78,7 +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("inspectionSheetId", event.getInspectionSheetId()) .addTag("argName", event.getArgName()) .addField("argValue", event.getArgValue()) .time(event.getTime().toEpochMilli(), WritePrecision.MS); @@ -93,7 +93,7 @@ public enum InfluxClient { for(Event event:events){ Point point = Point.measurement(measurement) .addTag("transationId", event.getTransationId()) - .addTag("inspectionSheet", event.getInspectionSheet()) + .addTag("inspectionSheetId", event.getInspectionSheetId()) .addTag("argName", event.getArgName()) .addField("argValue", event.getArgValue()) .time(event.getTime().toEpochMilli(), WritePrecision.MS); diff --git a/ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java b/ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java index 123caa3..1ee0a24 100644 --- a/ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java +++ b/ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java @@ -58,7 +58,7 @@ public class S7DemoController { event.setTransationId("asas"+i); event.setArgName("LTWeight"); Double d = r.nextDouble() * 2.5 + 66; - event.setInspectionSheet(j+""); + event.setInspectionSheetId(j+""); event.setArgValue(d); list.add(event); } @@ -88,7 +88,7 @@ public class S7DemoController { queryDataParam.setMeasurement("ASProcessCompleteEventAS"); List dropNames = new ArrayList<>(); dropNames.add("transationId"); - dropNames.add("inspectionSheet"); + dropNames.add("inspectionSheetId"); queryDataParam.setDropedTagNames(dropNames); queryDataParam.setTag(new Tag("argName","arg6")); queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(),Instant.now())); @@ -114,7 +114,7 @@ public class S7DemoController { queryDataParam.setMeasurement("ASProcessCompleteEventAS"); List dropNames = new ArrayList<>(); dropNames.add("transationId"); - dropNames.add("inspectionSheet"); + dropNames.add("inspectionSheetId"); queryDataParam.setDropedTagNames(dropNames); queryDataParam.setTag(new Tag("argName","arg7")); queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(),Instant.now())); diff --git a/ym-influx/src/main/java/com/cnbm/influx/template/Event.java b/ym-influx/src/main/java/com/cnbm/influx/template/Event.java index 4d26892..4635544 100644 --- a/ym-influx/src/main/java/com/cnbm/influx/template/Event.java +++ b/ym-influx/src/main/java/com/cnbm/influx/template/Event.java @@ -17,7 +17,7 @@ public class Event { private Instant time; - private String inspectionSheet; + private String inspectionSheetId; private String transationId; diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/mr/MeanRGraph.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/mr/MeanRGraph.java index 054488b..65493a9 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/mr/MeanRGraph.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/mr/MeanRGraph.java @@ -103,7 +103,7 @@ public class MeanRGraph { queryDataParam.setBucket(Constant.bucket); List dropNames = new ArrayList<>(); dropNames.add("transationId"); - dropNames.add("inspectionSheet"); + dropNames.add("inspectionSheetId"); queryDataParam.setDropedTagNames(dropNames); queryDataParam.setTag(new Tag("argName",argName)); queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now())); diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/ms/MeanStandardDeviationGraph.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/ms/MeanStandardDeviationGraph.java index a7ad932..f985e12 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/ms/MeanStandardDeviationGraph.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/ms/MeanStandardDeviationGraph.java @@ -100,7 +100,7 @@ public class MeanStandardDeviationGraph { queryDataParam.setBucket(Constant.bucket); List dropNames = new ArrayList<>(); dropNames.add("transationId"); - dropNames.add("inspectionSheet"); + dropNames.add("inspectionSheetId"); queryDataParam.setDropedTagNames(dropNames); queryDataParam.setTag(new Tag("argName",argName)); queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now()));