修改判读方案算法
This commit is contained in:
parent
8bfcaaf429
commit
f7712f184a
@ -76,21 +76,28 @@ public enum InfluxClient {
|
|||||||
return isConnected;
|
return isConnected;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* desc: 异步批量 写入数据/更新数据
|
||||||
|
* notes: 如果是更新数据,要保证time字段不能改变
|
||||||
|
* auth: caixaing
|
||||||
|
* */
|
||||||
public void insert(Event event, String measurement){
|
public void insert(Event event, String measurement){
|
||||||
|
|
||||||
Point point = null;
|
Point point = null;
|
||||||
if(event.getBatchNum()==null){
|
if(event.getBatchNum()==null){
|
||||||
point = Point.measurement(measurement)
|
point = Point.measurement(measurement)
|
||||||
.addTag("transationId", event.getTransationId())
|
.addTag("transationId", event.getTransationId())
|
||||||
.addTag("inspectionSheetId", event.getInspectionSheetId())
|
|
||||||
.addTag("argName", event.getArgName())
|
.addTag("argName", event.getArgName())
|
||||||
.addField("argValue", event.getArgValue())
|
.addField("argValue", event.getArgValue())
|
||||||
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
||||||
}else {
|
}else {
|
||||||
point = Point.measurement(measurement)
|
point = Point.measurement(measurement)
|
||||||
.addTag("transationId", event.getTransationId())
|
.addTag("transationId", event.getTransationId())
|
||||||
//.addTag("inspectionSheetId", event.getInspectionSheetId())
|
|
||||||
.addTag("batchNum", event.getBatchNum().toString())
|
.addTag("inspectionSheetId", event.getInspectionSheetId())
|
||||||
|
.addTag("sampleNumber", event.getSampleNumber())
|
||||||
|
.addTag("batchNum", event.getBatchNum())
|
||||||
|
|
||||||
.addTag("argName", event.getArgName())
|
.addTag("argName", event.getArgName())
|
||||||
.addField("argValue", event.getArgValue())
|
.addField("argValue", event.getArgValue())
|
||||||
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
||||||
@ -99,8 +106,11 @@ public enum InfluxClient {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//异步 批量写入数据
|
/**
|
||||||
//如果要批量插入的话,一次也只能写入
|
* desc: 异步批量 写入数据/更新数据
|
||||||
|
* notes: 如果是更新数据,要保证time字段不能改变
|
||||||
|
* auth: caixaing
|
||||||
|
* */
|
||||||
public void batchInsert(List<Event> events, String measurement){
|
public void batchInsert(List<Event> events, String measurement){
|
||||||
List<Point> list = new ArrayList<>();
|
List<Point> list = new ArrayList<>();
|
||||||
for(Event event:events){
|
for(Event event:events){
|
||||||
@ -108,15 +118,17 @@ public enum InfluxClient {
|
|||||||
if(event.getBatchNum()==null){
|
if(event.getBatchNum()==null){
|
||||||
point = Point.measurement(measurement)
|
point = Point.measurement(measurement)
|
||||||
.addTag("transationId", event.getTransationId())
|
.addTag("transationId", event.getTransationId())
|
||||||
.addTag("inspectionSheetId", event.getInspectionSheetId())
|
|
||||||
.addTag("argName", event.getArgName())
|
.addTag("argName", event.getArgName())
|
||||||
.addField("argValue", event.getArgValue())
|
.addField("argValue", event.getArgValue())
|
||||||
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
||||||
}else {
|
}else {
|
||||||
point = Point.measurement(measurement)
|
point = Point.measurement(measurement)
|
||||||
.addTag("transationId", event.getTransationId())
|
.addTag("transationId", event.getTransationId())
|
||||||
//.addTag("inspectionSheetId", event.getInspectionSheetId())
|
|
||||||
.addTag("batchNum", event.getBatchNum().toString())
|
.addTag("inspectionSheetId", event.getInspectionSheetId())
|
||||||
|
.addTag("sampleNumber", event.getSampleNumber())
|
||||||
|
.addTag("batchNum", event.getBatchNum())
|
||||||
|
|
||||||
.addTag("argName", event.getArgName())
|
.addTag("argName", event.getArgName())
|
||||||
.addField("argValue", event.getArgValue())
|
.addField("argValue", event.getArgValue())
|
||||||
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
|
||||||
|
@ -103,30 +103,34 @@ public class S7DemoController {
|
|||||||
public void insertAndQuery() throws InterruptedException {
|
public void insertAndQuery() throws InterruptedException {
|
||||||
Event event = new Event();
|
Event event = new Event();
|
||||||
|
|
||||||
|
// long l = System.currentTimeMillis();
|
||||||
|
// System.out.println("l:"+l);
|
||||||
|
// event.setTime(new Date(1669874900889l).toInstant());
|
||||||
|
//
|
||||||
event.setTime(new Date().toInstant());
|
event.setTime(new Date().toInstant());
|
||||||
event.setTransationId("2344");
|
event.setTransationId("4444");
|
||||||
event.setBatchNum("22");
|
event.setBatchNum("44");
|
||||||
event.setArgName("forUpdate");
|
event.setArgName("forUpdate");
|
||||||
event.setArgValue("124.1");
|
event.setArgValue("5555.1");
|
||||||
InfluxClient.Client.insert(event,"FORUPDATEEEE");
|
InfluxClient.Client.insert(event,"FORUPDATECAIXIANG");
|
||||||
// Thread.sleep(50000);
|
// Thread.sleep(50000);
|
||||||
//
|
//
|
||||||
// event.setArgValue(333.3);
|
// event.setArgValue(333.3);
|
||||||
// InfluxClient.Client.insert(event,"FORUPDATE");
|
// InfluxClient.Client.insert(event,"FORUPDATE");
|
||||||
|
|
||||||
|
|
||||||
QueryDataParam queryDataParam = new QueryDataParam();
|
// QueryDataParam queryDataParam = new QueryDataParam();
|
||||||
queryDataParam.setBucket("qgs-bucket");
|
// queryDataParam.setBucket("qgs-bucket");
|
||||||
queryDataParam.setMeasurement("FORUPDATEEEE");
|
// queryDataParam.setMeasurement("FORUPDATECAIXIANG");
|
||||||
List<String> dropNames = new ArrayList<>();
|
// List<String> dropNames = new ArrayList<>();
|
||||||
dropNames.add("transationId");
|
// dropNames.add("transationId");
|
||||||
dropNames.add("inspectionSheetId");
|
// dropNames.add("inspectionSheetId");
|
||||||
queryDataParam.setDropedTagNames(dropNames);
|
// queryDataParam.setDropedTagNames(dropNames);
|
||||||
queryDataParam.setTag(new Tag("argName","forUpdate"));
|
// queryDataParam.setTag(new Tag("argName","forUpdate"));
|
||||||
queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(),DataUtils.getAfterDate(999).toInstant()));
|
// queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(),DataUtils.getAfterDate(999).toInstant()));
|
||||||
queryDataParam.setPageInfo(new PageInfo(1,10));
|
// queryDataParam.setPageInfo(new PageInfo(1,10));
|
||||||
List<FluxTable> query = InfluxClient.Client.query(queryDataParam);
|
// List<FluxTable> query = InfluxClient.Client.query(queryDataParam);
|
||||||
System.out.println();
|
// System.out.println();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,12 +23,17 @@ public class Event {
|
|||||||
|
|
||||||
private String argValue;
|
private String argValue;
|
||||||
|
|
||||||
private String BatchNum;
|
//batchNumber(必填), 作为区分 手动录入 和 自动录入的区别
|
||||||
|
private String batchNum;
|
||||||
|
|
||||||
private String InspectionSheetId;
|
private String inspectionSheetId;
|
||||||
|
|
||||||
|
private String sampleNumber;
|
||||||
|
|
||||||
public Event() {
|
public Event() {
|
||||||
BatchNum = "1";
|
//自动录入,给个默认值
|
||||||
InspectionSheetId = "1";
|
this.batchNum = "-1";
|
||||||
|
this.inspectionSheetId = "-1";
|
||||||
|
this.sampleNumber = "-1";
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user