|
|
@@ -147,49 +147,48 @@ public class ProcessInspectionController { |
|
|
|
xmrGraph.getSpecificationLimit()==null?null:xmrGraph.getSpecificationLimit(), |
|
|
|
xmrGraph.getProcessCapacity()==null?null:xmrGraph.getProcessCapacity(), |
|
|
|
(xmrGraph.getXigma()==null||xmrGraph.getTotalXigma()==null)?null:new StandardDiviation(xmrGraph.getXigma(),xmrGraph.getTotalXigma()) |
|
|
|
|
|
|
|
); |
|
|
|
return R.ok("成功",xmrGraphData); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/getBatchs") |
|
|
|
public R<List<String>> getBatchs() throws InterruptedException { |
|
|
|
List<Event> list = new ArrayList<>(); |
|
|
|
Random r = new Random(); |
|
|
|
Instant instant = DataUtils.getBeforeDate(400).toInstant(); |
|
|
|
List<String> res = new ArrayList<>(); |
|
|
|
|
|
|
|
QueryDataParam queryDataParam = new QueryDataParam(); |
|
|
|
queryDataParam.setBucket("qgs-bucket"); |
|
|
|
queryDataParam.setMeasurement("Weight"); |
|
|
|
List<String> dropNames = new ArrayList<>(); |
|
|
|
dropNames.add("transationId"); |
|
|
|
dropNames.add("_value"); |
|
|
|
dropNames.add("_start"); |
|
|
|
dropNames.add("_stop"); |
|
|
|
dropNames.add("_time"); |
|
|
|
dropNames.add("_field"); |
|
|
|
dropNames.add("_measurement"); |
|
|
|
dropNames.add("inspectionSheetId"); |
|
|
|
dropNames.add("argName"); |
|
|
|
queryDataParam.setDropedTagNames(dropNames); |
|
|
|
|
|
|
|
queryDataParam.setTags(Arrays.asList(new Tag("argName","LTWeight"))); |
|
|
|
|
|
|
|
queryDataParam.setRange(new Range(DataUtils.getBeforeDate(100).toInstant(),Instant.now())); |
|
|
|
// queryDataParam.setPageInfo(new PageInfo(1,10)); |
|
|
|
List<FluxTable> query = InfluxClient.Client.queryByGroup(queryDataParam); |
|
|
|
|
|
|
|
|
|
|
|
for (FluxTable fluxTable : query) { |
|
|
|
List<FluxRecord> records = fluxTable.getRecords(); |
|
|
|
if(records.size()!=0){ |
|
|
|
res.add((String) records.get(0).getValueByKey("batchNum")); |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
return R.ok(res); |
|
|
|
} |
|
|
|
// @PostMapping("/getBatchs") |
|
|
|
// public R<List<String>> getBatchs() throws InterruptedException { |
|
|
|
// List<Event> list = new ArrayList<>(); |
|
|
|
// Random r = new Random(); |
|
|
|
// Instant instant = DataUtils.getBeforeDate(400).toInstant(); |
|
|
|
// List<String> res = new ArrayList<>(); |
|
|
|
// |
|
|
|
// QueryDataParam queryDataParam = new QueryDataParam(); |
|
|
|
// queryDataParam.setBucket("qgs-bucket"); |
|
|
|
// queryDataParam.setMeasurement("Weight"); |
|
|
|
// List<String> dropNames = new ArrayList<>(); |
|
|
|
// dropNames.add("transationId"); |
|
|
|
// dropNames.add("_value"); |
|
|
|
// dropNames.add("_start"); |
|
|
|
// dropNames.add("_stop"); |
|
|
|
// dropNames.add("_time"); |
|
|
|
// dropNames.add("_field"); |
|
|
|
// dropNames.add("_measurement"); |
|
|
|
// dropNames.add("inspectionSheetId"); |
|
|
|
// dropNames.add("argName"); |
|
|
|
// queryDataParam.setDropedTagNames(dropNames); |
|
|
|
// |
|
|
|
// queryDataParam.setTags(Arrays.asList(new Tag("argName","LTWeight"))); |
|
|
|
// |
|
|
|
// queryDataParam.setRange(new Range(DataUtils.getBeforeDate(100).toInstant(),Instant.now())); |
|
|
|
//// queryDataParam.setPageInfo(new PageInfo(1,10)); |
|
|
|
// List<FluxTable> query = InfluxClient.Client.queryByGroup(queryDataParam); |
|
|
|
// |
|
|
|
// |
|
|
|
// for (FluxTable fluxTable : query) { |
|
|
|
// List<FluxRecord> records = fluxTable.getRecords(); |
|
|
|
// if(records.size()!=0){ |
|
|
|
// res.add((String) records.get(0).getValueByKey("batchNum")); |
|
|
|
// continue; |
|
|
|
// } |
|
|
|
// } |
|
|
|
// return R.ok(res); |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/NPGraphTest") |
|
|
@@ -216,6 +215,32 @@ public class ProcessInspectionController { |
|
|
|
|
|
|
|
return R.ok("成功",npGraph1); |
|
|
|
} |
|
|
|
@PostMapping("/NPGraph") |
|
|
|
public R<NPGraphData> NPGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
|
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
if(productFeatures == null){ |
|
|
|
return R.failed("检验参数异常"); |
|
|
|
} |
|
|
|
|
|
|
|
NPGraph npGraph = new NPGraph(productFeatures); |
|
|
|
|
|
|
|
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); |
|
|
|
queryDataParam.setMeasurement(Constant.measurement); |
|
|
|
queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() )); |
|
|
|
queryDataParam.setTimeType(graphArg.getGroupType()); |
|
|
|
npGraph.initialDate(queryDataParam); |
|
|
|
|
|
|
|
NPGraphData npGraph1 = new NPGraphData( |
|
|
|
npGraph.getList()==null?null:npGraph.getList(), |
|
|
|
npGraph.getArgName()==null?null:npGraph.getArgName() |
|
|
|
); |
|
|
|
return R.ok("成功",npGraph1); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/PGraphTest") |
|
|
|
public R<PGraphData> PGraphTest() throws Exception { |
|
|
|
ProductFeatures productFeatures = new ProductFeatures(); |
|
|
@@ -296,9 +321,13 @@ public class ProcessInspectionController { |
|
|
|
|
|
|
|
private ProductFeatures setRealSampleSize(GraphArg graphArg){ |
|
|
|
ProductFeaturesDTO productFeaturesDTO = productFeaturesService.get(graphArg.getProductFeaturesId()); |
|
|
|
if(productFeaturesDTO == null){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
if(graphArg.getSampleSize()!=null){ |
|
|
|
productFeaturesDTO.setSampleSize(graphArg.getSampleSize()); |
|
|
|
} |
|
|
|
|
|
|
|
ProductFeatures productFeatures = new ProductFeatures(); |
|
|
|
BeanUtils.copyProperties(productFeaturesDTO, productFeatures); |
|
|
|
return productFeatures; |
|
|
@@ -313,7 +342,9 @@ public class ProcessInspectionController { |
|
|
|
@PostMapping("/XbarSGraph") |
|
|
|
public R<XbarSGraphData> xbarSGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
if(productFeatures == null){ |
|
|
|
return R.failed("检验参数异常"); |
|
|
|
} |
|
|
|
MeanStandardDeviationGraph meanStandardDeviationGraph = new MeanStandardDeviationGraph(productFeatures); |
|
|
|
if(graphArg.getInterpretationScheme()!=null){ |
|
|
|
meanStandardDeviationGraph.isNeedInterpretation(graphArg.getInterpretationScheme()); |
|
|
@@ -339,7 +370,9 @@ public class ProcessInspectionController { |
|
|
|
public R<XbarRGraphData> XbarRGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
|
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
if(productFeatures == null){ |
|
|
|
return R.failed("检验参数异常"); |
|
|
|
} |
|
|
|
MeanRGraph meanRGraph = new MeanRGraph(productFeatures); |
|
|
|
//如果要检验,,那么set 判读方案 |
|
|
|
if(graphArg.getInterpretationScheme()!=null){ |
|
|
@@ -372,7 +405,9 @@ public class ProcessInspectionController { |
|
|
|
public R<XMRGraphData> XMRGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
|
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
if(productFeatures == null){ |
|
|
|
return R.failed("检验参数异常"); |
|
|
|
} |
|
|
|
XMRGraph xmrGraph = new XMRGraph(productFeatures); |
|
|
|
//如果要检验,,那么set 判读方案 |
|
|
|
if(graphArg.getInterpretationScheme()!=null){ |
|
|
@@ -397,31 +432,15 @@ public class ProcessInspectionController { |
|
|
|
return R.ok("成功",xmrGraphData); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/NPGraph") |
|
|
|
public R<NPGraphData> NPGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
|
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
NPGraph npGraph = new NPGraph(productFeatures); |
|
|
|
|
|
|
|
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); |
|
|
|
queryDataParam.setMeasurement(Constant.measurement); |
|
|
|
queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() )); |
|
|
|
queryDataParam.setTimeType(graphArg.getGroupType()); |
|
|
|
npGraph.initialDate(queryDataParam); |
|
|
|
|
|
|
|
NPGraphData npGraph1 = new NPGraphData( |
|
|
|
npGraph.getList()==null?null:npGraph.getList(), |
|
|
|
npGraph.getArgName()==null?null:npGraph.getArgName() |
|
|
|
); |
|
|
|
return R.ok("成功",npGraph1); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/PGraph") |
|
|
|
public R<PGraphData> PGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
|
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
if(productFeatures == null){ |
|
|
|
return R.failed("检验参数异常"); |
|
|
|
} |
|
|
|
PGraph pGraph = new PGraph(productFeatures); |
|
|
|
|
|
|
|
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); |
|
|
@@ -440,7 +459,9 @@ public class ProcessInspectionController { |
|
|
|
public R<CGraphData> CGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
|
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
if(productFeatures == null){ |
|
|
|
return R.failed("检验参数异常"); |
|
|
|
} |
|
|
|
CGraph cGraph = new CGraph(productFeatures); |
|
|
|
|
|
|
|
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); |
|
|
@@ -460,7 +481,9 @@ public class ProcessInspectionController { |
|
|
|
public R<UGraphData> UGraph(@RequestBody GraphArg graphArg) throws Exception { |
|
|
|
|
|
|
|
ProductFeatures productFeatures = setRealSampleSize(graphArg); |
|
|
|
|
|
|
|
if(productFeatures == null){ |
|
|
|
return R.failed("检验参数异常"); |
|
|
|
} |
|
|
|
UGraph uGraph = new UGraph(productFeatures); |
|
|
|
|
|
|
|
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); |
|
|
|