mark for pull

This commit is contained in:
caixiang 2022-07-29 14:23:13 +08:00
parent 8a3a037bda
commit 2d1ef3d743
2 changed files with 12 additions and 1 deletions

View File

@ -1,6 +1,8 @@
package com.cnbm.processInspection.controller; package com.cnbm.processInspection.controller;
import com.cnbm.basic.dto.ProductFeaturesDTO;
import com.cnbm.basic.entity.ProductFeatures; import com.cnbm.basic.entity.ProductFeatures;
import com.cnbm.basic.service.IProductFeaturesService;
import com.cnbm.common.spc.math.StandardDiviation; import com.cnbm.common.spc.math.StandardDiviation;
import com.cnbm.common.spc.util.DataUtils; import com.cnbm.common.spc.util.DataUtils;
import com.cnbm.common.vo.R; import com.cnbm.common.vo.R;
@ -15,6 +17,7 @@ import com.cnbm.processInspection.graphAnalyzed.mr.MeanRGraph;
import com.cnbm.processInspection.graphAnalyzed.ms.MeanStandardDeviationGraph; import com.cnbm.processInspection.graphAnalyzed.ms.MeanStandardDeviationGraph;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -29,11 +32,15 @@ import java.util.List;
@RequestMapping("/processInspection") @RequestMapping("/processInspection")
public class ProcessInspectionController { public class ProcessInspectionController {
private static final Logger logger = LoggerFactory.getLogger(ProcessInspectionController.class); private static final Logger logger = LoggerFactory.getLogger(ProcessInspectionController.class);
@Autowired
IProductFeaturesService productFeaturesService;
@PostMapping("/XbarSGraphTest") @PostMapping("/XbarSGraphTest")
public R<XbarSGraphData> xbarSGraphTest() throws Exception { public R<XbarSGraphData> xbarSGraphTest() throws Exception {
ProductFeaturesDTO productFeaturesDTO = productFeaturesService.get(new Long(1));
ProductFeatures productFeatures = new ProductFeatures(); ProductFeatures productFeatures = new ProductFeatures();
productFeatures.setSl(new Float(5)); productFeatures.setSl(new Float(5));
productFeatures.setUsl(new Float(10)); productFeatures.setUsl(new Float(10));

View File

@ -29,4 +29,8 @@ public class GraphArg {
@ApiModelProperty(value = "判读方案列表") @ApiModelProperty(value = "判读方案列表")
private List<InterpretationListArg> interpretationScheme; private List<InterpretationListArg> interpretationScheme;
@ApiModelProperty(value = "样本大小,不填的话用之前配置的")
private Integer sampleSize;
} }