Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
This commit is contained in:
@@ -107,7 +107,7 @@ public class S7DemoController {
|
||||
queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
|
||||
|
||||
queryDataParam.setDropedTagNames(dropNames);
|
||||
queryDataParam.setTags(Arrays.asList(new Tag("argName","LTWeight"),new Tag("inspectionSheetId","1601096578382766082")));
|
||||
queryDataParam.setTags(Arrays.asList(new Tag("argName","LTWeight"),new Tag("inspectionSheetId","1601123134690340865")));
|
||||
queryDataParam.setBucket(Constant.bucket);
|
||||
List<FluxTable> query = InfluxClient.Client.query(queryDataParam);
|
||||
|
||||
@@ -132,8 +132,22 @@ public class S7DemoController {
|
||||
return new Result<Instant>().ok(time);
|
||||
}
|
||||
|
||||
@PostMapping("/saveFlux")
|
||||
public void saveFlux(@RequestBody TIMETest timeTest) throws InterruptedException {
|
||||
@PostMapping("/saveFlux1")
|
||||
public Result<Instant> saveFlux1() throws InterruptedException {
|
||||
|
||||
List<Event> list = new ArrayList<>();
|
||||
Event event2 = new Event();
|
||||
Instant instant = new Date().toInstant();
|
||||
event2.setTime(instant);
|
||||
event2.setArgName("failDayDay");
|
||||
event2.setArgValue("");
|
||||
event2.setSampleNumber("10001");
|
||||
list.add(event2);
|
||||
InfluxClient.Client.batchInsert(list,"Weight");
|
||||
return new Result<Instant>().ok(instant);
|
||||
}
|
||||
@PostMapping("/saveFlux2")
|
||||
public void saveFlux2(@RequestBody TIMETest timeTest) throws InterruptedException {
|
||||
|
||||
List<Event> list = new ArrayList<>();
|
||||
Event event2 = new Event();
|
||||
|
||||
Reference in New Issue
Block a user