From 2d1ef3d743f3b31c9d636c0e33aff53516f3c50f Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Fri, 29 Jul 2022 14:23:13 +0800 Subject: [PATCH 1/3] mark for pull --- .../controller/ProcessInspectionController.java | 9 ++++++++- .../java/com/cnbm/processInspection/dto/GraphArg.java | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java index e268cf4..e8d1008 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java @@ -1,6 +1,8 @@ package com.cnbm.processInspection.controller; +import com.cnbm.basic.dto.ProductFeaturesDTO; import com.cnbm.basic.entity.ProductFeatures; +import com.cnbm.basic.service.IProductFeaturesService; import com.cnbm.common.spc.math.StandardDiviation; import com.cnbm.common.spc.util.DataUtils; 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,11 +32,15 @@ import java.util.List; @RequestMapping("/processInspection") public class ProcessInspectionController { private static final Logger logger = LoggerFactory.getLogger(ProcessInspectionController.class); - + @Autowired + IProductFeaturesService productFeaturesService; @PostMapping("/XbarSGraphTest") public R xbarSGraphTest() throws Exception { + ProductFeaturesDTO productFeaturesDTO = productFeaturesService.get(new Long(1)); + + ProductFeatures productFeatures = new ProductFeatures(); productFeatures.setSl(new Float(5)); productFeatures.setUsl(new Float(10)); diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java index b35a7ff..0cc08b0 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java @@ -29,4 +29,8 @@ public class GraphArg { @ApiModelProperty(value = "判读方案列表") private List interpretationScheme; + @ApiModelProperty(value = "样本大小，不填的话用之前配置的") + private Integer sampleSize; + + } From e9c8f7857b6a540b86b73b0669ff1c98fdae9c2d Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Fri, 29 Jul 2022 16:56:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AXMR=20=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessInspectionController.java | 85 ++++- .../cnbm/processInspection/dto/GraphArg.java | 4 +- .../processInspection/dto/XMRGraphData.java | 45 +++ .../graphAnalyzed/mr/MeanRGraph.java | 1 - .../ms/MeanStandardDeviationGraph.java | 1 - .../graphAnalyzed/xmr/XMRGraph.java | 301 ++++++++++++++++++ .../graphAnalyzed/xmr/XMRGraphEntity.java | 50 +++ .../cnbm/qualityPlanning/entity/XMRPoint.java | 95 ++++++ 8 files changed, 569 insertions(+), 13 deletions(-) create mode 100644 ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XMRGraphData.java create mode 100644 ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraph.java create mode 100644 ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraphEntity.java create mode 100644 ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/entity/XMRPoint.java diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java index 5500490..e7fd26b 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java @@ -9,21 +9,19 @@ import com.cnbm.common.vo.R; import com.cnbm.influx.constant.Constant; import com.cnbm.influx.param.QueryDataParam; import com.cnbm.influx.param.Range; -import com.cnbm.processInspection.dto.GraphArg; -import com.cnbm.processInspection.dto.InterpretationListArg; -import com.cnbm.processInspection.dto.XbarRGraphData; -import com.cnbm.processInspection.dto.XbarSGraphData; +import com.cnbm.processInspection.dto.*; import com.cnbm.processInspection.graphAnalyzed.mr.MeanRGraph; import com.cnbm.processInspection.graphAnalyzed.ms.MeanStandardDeviationGraph; +import com.cnbm.processInspection.graphAnalyzed.xmr.XMRGraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.math.BigDecimal; import java.time.Instant; import java.util.ArrayList; import java.util.List; @@ -106,7 +104,49 @@ public class ProcessInspectionController { return R.ok("成功",xbarSGraphData); } + @PostMapping("/XMRGraphTest") + public R XMRGraphTest() throws Exception { + ProductFeatures productFeatures = new ProductFeatures(); + productFeatures.setSl(new Float(5)); + productFeatures.setUsl(new Float(10)); + productFeatures.setLsl(new Float(1)); + productFeatures.setName("LTWeight"); + productFeatures.setSampleSize(1); + XMRGraph xmrGraph = new XMRGraph(productFeatures); + //判读方案 + List interpretationScheme = new ArrayList<>(); + interpretationScheme.add(new InterpretationListArg(1,null,null)); + interpretationScheme.add(new InterpretationListArg(5,3,2)); + xmrGraph.isNeedInterpretation(interpretationScheme); + + + QueryDataParam queryDataParam = new QueryDataParam(); + queryDataParam.setMeasurement("Weight"); + queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now())); + xmrGraph.initialDate(queryDataParam); + + XMRGraphData xmrGraphData = new XMRGraphData( + xmrGraph.getXmrGraphEntity(), + xmrGraph.getXCL(), + xmrGraph.getRSCL(), + xmrGraph.getSpecificationLimit(), + xmrGraph.getProcessCapacity(), + new StandardDiviation(xmrGraph.getXigma(),xmrGraph.getTotalXigma()) + ); + + return R.ok("成功",xmrGraphData); + } + + private ProductFeatures setRealSampleSize(GraphArg graphArg){ + ProductFeaturesDTO productFeaturesDTO = productFeaturesService.get(graphArg.getProductFeaturesId()); + if(graphArg.getSampleSize()!=null){ + productFeaturesDTO.setSampleSize(graphArg.getSampleSize()); + } + ProductFeatures productFeatures = new ProductFeatures(); + BeanUtils.copyProperties(productFeaturesDTO, productFeatures); + return productFeatures; + } //筛选条件顺序： // ① 先工厂（产品表） => ② 检验类型（产品表）=> ③ 产品名（产品表）=> ④ 工序（产品表）=> ⑤ 特性（检验参数name）（ product_features 表） ；； @@ -116,8 +156,7 @@ public class ProcessInspectionController { // 3.检验类型（产品表） ; 4.产品名 （产品表）; 5.工艺流程（就是工序 ，也是设备名，用到工序表）; 6.特性(product_features.name ,也是influxdb中的argName) ; @PostMapping("/XbarSGraph") public R xbarSGraph(@RequestBody GraphArg graphArg) throws Exception { - - ProductFeatures productFeatures = graphArg.getProductFeatures(); + ProductFeatures productFeatures = setRealSampleSize(graphArg); MeanStandardDeviationGraph meanStandardDeviationGraph = new MeanStandardDeviationGraph(productFeatures); if(graphArg.getInterpretationScheme()!=null){ @@ -143,8 +182,8 @@ public class ProcessInspectionController { @PostMapping("/XbarRGraph") public R XbarRGraph(@RequestBody GraphArg graphArg) throws Exception { - //new 对象 - ProductFeatures productFeatures = graphArg.getProductFeatures(); + ProductFeatures productFeatures = setRealSampleSize(graphArg); + MeanRGraph meanRGraph = new MeanRGraph(productFeatures); //如果要检验，，那么set 判读方案 if(graphArg.getInterpretationScheme()!=null){ @@ -168,4 +207,32 @@ public class ProcessInspectionController { return R.ok("成功",xbarSGraphData); } + @PostMapping("/XMRGraph") + public R XMRGraph(@RequestBody GraphArg graphArg) throws Exception { + + ProductFeatures productFeatures = setRealSampleSize(graphArg); + + XMRGraph xmrGraph = new XMRGraph(productFeatures); + //如果要检验，，那么set 判读方案 + if(graphArg.getInterpretationScheme()!=null){ + xmrGraph.isNeedInterpretation(graphArg.getInterpretationScheme()); + } + + QueryDataParam queryDataParam = new QueryDataParam(); + queryDataParam.setMeasurement(Constant.measurement); + queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant())); + xmrGraph.initialDate(queryDataParam); + + XMRGraphData xmrGraphData = new XMRGraphData( + xmrGraph.getXmrGraphEntity(), + xmrGraph.getXCL(), + xmrGraph.getRSCL(), + xmrGraph.getSpecificationLimit(), + xmrGraph.getProcessCapacity(), + new StandardDiviation(xmrGraph.getXigma(),xmrGraph.getTotalXigma()) + ); + + return R.ok("成功",xmrGraphData); + } + } diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java index 0cc08b0..5b1212d 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java @@ -17,8 +17,8 @@ import java.util.List; @Data @ApiModel(value = "控制图 查询参数类") public class GraphArg { - @ApiModelProperty(value = "检验特性，，全量传过来") - private ProductFeatures productFeatures; + @ApiModelProperty(value = "检验特性Id") + private Long productFeaturesId; @ApiModelProperty(value = "查询时间段，开始") private Date begin; diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XMRGraphData.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XMRGraphData.java new file mode 100644 index 0000000..080201c --- /dev/null +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XMRGraphData.java @@ -0,0 +1,45 @@ +package com.cnbm.processInspection.dto; + +import com.cnbm.common.spc.math.StandardDiviation; +import com.cnbm.processInspection.graphAnalyzed.xmr.XMRGraphEntity; +import com.cnbm.qualityPlanning.entity.ControlLimit; +import com.cnbm.qualityPlanning.entity.ProcessCapability; +import com.cnbm.qualityPlanning.entity.SpecificationLimit; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2022/7/22 14:18 + */ +@Data +@ApiModel(value = "均值极差控制图 结果类") +public class XMRGraphData { + @ApiModelProperty(value = "控制图list数据") + private XMRGraphEntity xmrGraphEntity; + @ApiModelProperty(value = "xbar控制图 控制限") + private ControlLimit XBarCL; + @ApiModelProperty(value = "R控制图 控制限") + private ControlLimit RCL; + + @ApiModelProperty(value = "工艺规格限") + private SpecificationLimit SL; + + @ApiModelProperty(value = "工序能力") + private ProcessCapability processCapability; + + @ApiModelProperty(value = "标准差/总体标准差") + private StandardDiviation standardDiviation; + + + public XMRGraphData(XMRGraphEntity xmrGraphEntity, ControlLimit xBarCL, ControlLimit rCL, SpecificationLimit sl, ProcessCapability processCapability, StandardDiviation standardDiviation){ + this.xmrGraphEntity = xmrGraphEntity; + this.XBarCL = xBarCL; + this.RCL = rCL; + this.SL = sl; + this.processCapability = processCapability; + this.standardDiviation = standardDiviation; + } +} 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 65493a9..61c8112 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 @@ -106,7 +106,6 @@ public class MeanRGraph { dropNames.add("inspectionSheetId"); queryDataParam.setDropedTagNames(dropNames); queryDataParam.setTag(new Tag("argName",argName)); - queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now())); List query = InfluxClient.Client.query(queryDataParam); //1. 先从fluxdb 里面提取原始数据 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 f985e12..7490274 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 @@ -103,7 +103,6 @@ public class MeanStandardDeviationGraph { dropNames.add("inspectionSheetId"); queryDataParam.setDropedTagNames(dropNames); queryDataParam.setTag(new Tag("argName",argName)); - queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now())); List query = InfluxClient.Client.query(queryDataParam); //1. 先从fluxdb 里面提取原始数据 diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraph.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraph.java new file mode 100644 index 0000000..0651100 --- /dev/null +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraph.java @@ -0,0 +1,301 @@ +package com.cnbm.processInspection.graphAnalyzed.xmr; + +import com.cnbm.basic.entity.ProductFeatures; +import com.cnbm.common.spc.math.Math; +import com.cnbm.common.spc.math.StandardDiviation; +import com.cnbm.influx.config.InfluxClient; +import com.cnbm.influx.constant.Constant; +import com.cnbm.influx.param.QueryDataParam; +import com.cnbm.influx.param.Tag; +import com.cnbm.processInspection.dto.InterpretationListArg; +import com.cnbm.qualityPlanning.common.StatisticalControlledTest; +import com.cnbm.qualityPlanning.entity.*; +import com.influxdb.query.FluxRecord; +import com.influxdb.query.FluxTable; +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; + +/** + * @Desc: "均值标准差 控制图 , 计算类" + * @Author: caixiang + * @DATE: 2022/7/20 14:26 + * 使用方式：① 先new MeanStandardDeviationGraph 对象 ；② 再initialData 初始化数据；③ 再get 控制限 + * + * 步骤： + * ① 先读mysql表，查询 product_features 表，先读到 sample_size（样本量） + * ② 再依据 influx.argName == mysql.product_feature.name && 时间段 查询所有的 参数数据 + * ③ 拿到参数数据后，分组 整合成List, + * 计算控制限 + * 计算 母体 的 \sigma 、 bar{x} 。。。 + * 计算CPK 、CPU 、CPL这些 + * ④ 如果配置了判读方案，还要 调用 StatisticalControlledTest Function 检验。 + * ⑤ + */ +@Data +public class XMRGraph { + //母体的 μ = xbarbar + private Double miu; + //母体的 xigma ，全局计算的; + private Double xigma; + //母体的 xigma ，全局计算的; + private Double totalXigma; + + //需要去检验的 判读方案 eg:[1,2,3,4,6] + private List interpretationScheme; + + //这里 是特有参数 -- begin + + //单值移动极差 控制图 xbar == xbarbar + private Double xbar; + private Double rsbar; + //这里 是特有参数 -- end + + private Integer sampleSize; + private String argName; + + private SpecificationLimit specificationLimit; + private XMRGraphEntity xmrGraphEntity; + + + public XMRGraph(ProductFeatures productFeatures) throws Exception { + if(productFeatures.getSampleSize()==null || productFeatures.getName()==null){ + throw new Exception("ProductFeatures 参数异常"); + } + this.argName = productFeatures.getName(); + this.sampleSize = 1; + this.specificationLimit = new SpecificationLimit( + productFeatures.getUsl()==null?null:productFeatures.getUsl(), + productFeatures.getSl()==null?null:productFeatures.getSl(), + productFeatures.getUsl()==null?null:productFeatures.getUsl() + ); + } + + private Double[] toDoubleArray(Object[] o){ + Double[] res= new Double[o.length]; + for(int i=0;i list){ + this.interpretationScheme = list; + } + + /** + * name : 初始化数据函数 + * desc : 从influxdb 里面读取数据，然后 加工处理成 我需要的 + * 步骤： + * ① + * */ + public void initialDate(QueryDataParam queryDataParam){ + queryDataParam.setBucket(Constant.bucket); + List dropNames = new ArrayList<>(); + dropNames.add("transationId"); + dropNames.add("inspectionSheetId"); + queryDataParam.setDropedTagNames(dropNames); + queryDataParam.setTag(new Tag("argName",argName)); + + + List query = InfluxClient.Client.query(queryDataParam); + //1. 先从fluxdb 里面提取原始数据 + List originData = new ArrayList<>(); + for (FluxTable fluxTable : query) { + List records = fluxTable.getRecords(); + for (FluxRecord fluxRecord : records) { + //因为 传进去的就是Double 类型，所以取出来，自然而然就是Double + originData.add(Double.parseDouble(fluxRecord.getValueByKey("_value").toString())); + } + } + + //2. convert to XbarSPoint + List list = new ArrayList<>(); + Double lastOne = (double) 0; + List rsArray = new ArrayList<>(); + for(int i=0;i forX = new ArrayList<>(); + List forRS = new ArrayList<>(); + for(XMRPoint x:list){ + forX.add( new Point( x.getPosition() , x.getX() ) ); + if(x.getPosition()!=0){ + forRS.add( new Point( x.getPosition(), x.getRs() ) ); + } + } + ControlLimit xcl = getXCL(); + ControlLimit rscl = getRSCL(); + + for(InterpretationListArg arg : this.interpretationScheme){ + switch (arg.getNumber())//值必须是整型或者字符型 + { + case 1: + StatisticalControlledTest.rule1(forX,xcl); + StatisticalControlledTest.rule1(forRS,rscl); + break; + case 2: + StatisticalControlledTest.rule2(forX,xcl,arg.getArg1()); + StatisticalControlledTest.rule2(forRS,rscl,arg.getArg1()); + break; + case 3: + StatisticalControlledTest.rule3(forX,arg.getArg1()); + StatisticalControlledTest.rule3(forRS,arg.getArg1()); + break; + case 4: + StatisticalControlledTest.rule4(forX,arg.getArg1()); + StatisticalControlledTest.rule4(forRS,arg.getArg1()); + break; + case 5: + StatisticalControlledTest.rule5(forX,xcl,arg.getArg1(), arg.getArg2()); + StatisticalControlledTest.rule5(forRS,rscl,arg.getArg1(), arg.getArg2()); + break; + case 6: + StatisticalControlledTest.rule6(forX,xcl,arg.getArg1(), arg.getArg2()); + StatisticalControlledTest.rule6(forRS,rscl,arg.getArg1(), arg.getArg2()); + break; + case 7: + StatisticalControlledTest.rule7(forX,xcl,arg.getArg1()); + StatisticalControlledTest.rule7(forRS,rscl, arg.getArg1()); + + break; + case 8: + StatisticalControlledTest.rule8(forX,xcl, arg.getArg1()); + StatisticalControlledTest.rule8(forRS,rscl, arg.getArg1()); + break; + default: + break; + } + } + + for(int i=0;i()); + }else { + list.get(i).setxUnsatisfiedRules(forX.get(i).getUnsatisfiedRules()); + list.get(i).setRsUnsatisfiedRules(forRS.get(i-1).getUnsatisfiedRules()); + } + + } + + + } + // 结束 + + } + + + + + /** + * desc: get X控制图(单值控制图) 的控制限 + * 注意：此函数 要在 initialDate()函数执行之后 + * */ + public ControlLimit getXCL(){ + return new ControlLimit( + (this.xmrGraphEntity.getXbar() + 2.66 * this.xmrGraphEntity.getRsbar()), + this.xmrGraphEntity.getXbar() , + (this.xmrGraphEntity.getXbar() - 2.66 * this.xmrGraphEntity.getRsbar()) + ); + } + + /** + * desc: get R控制图 的控制限 + * 注意：此函数 要在 initialDate()函数执行之后 + * */ + public ControlLimit getRSCL(){ + return new ControlLimit( + ( 3.267 * this.xmrGraphEntity.getRsbar() ) , + this.xmrGraphEntity.getRsbar() , + (double) 0 + ); + } + + /** + * desc: get 工序能力 + * 注意：此函数 要在 initialDate()函数执行之后 + * */ + public ProcessCapability getProcessCapacity(){ + SpecificationLimit sp = this.specificationLimit; + List warming = new ArrayList<>(); + Float usl = sp.getUSL(); + Float lsl = sp.getLSL(); + if(usl==null || lsl==null){ + if(usl==null && lsl!=null){ + if(this.miuusl){ + warming.add("平均值已不能满足规范要求, 有相当多数据均为不合格, 则表示完全没有工序能力"); + return new ProcessCapability(null,null,(double)0,null,warming); + } + + Double cpu = ( (usl-this.miu) / (3 * this.xigma) ); + return new ProcessCapability(null,null,cpu,null,warming); + }else { + return new ProcessCapability(null,null,null,null,warming); + } + } + + //下面就是 usl 和 lsl 都部位null的情况 + Float k1 = usl-lsl; + Float k2 = usl+lsl; + + Double cp = ( k1 / (6*this.xigma) ); + Double k = ( java.lang.Math.abs( (this.miu-k2/2) ) / (k1/2) ); + if(k>1){ + warming.add("此工艺参数K 大于1, 说明均值μ已经偏离到规范范围意外，即相当多的工艺参数均不满足规范要求，这说明工艺加工结果很差，该设备根本不适用于批量生产"); + } + Double cpk = cp * ( 1- k); + if(cpk<0){ + warming.add("Cpk=0，该工序完全没有能力 批量生产"); + cpk = (double) 0; + } + Double cpu = ( (usl-this.miu) / (3 * this.xigma) ); + Double cpl = ( (this.miu-lsl) / (3 * this.xigma) ); + + return new ProcessCapability(cp,cpk,cpu,cpl,warming); + } +} diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraphEntity.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraphEntity.java new file mode 100644 index 0000000..45f9014 --- /dev/null +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/xmr/XMRGraphEntity.java @@ -0,0 +1,50 @@ +package com.cnbm.processInspection.graphAnalyzed.xmr; + + + +import com.cnbm.qualityPlanning.entity.XMRPoint; +import com.cnbm.qualityPlanning.entity.XbarRPoint; + +import java.util.List; + +/** + * @Desc: "xbar-R 结果类" + * @Author: caixiang + * @DATE: 2022/7/21 16:26 + */ +public class XMRGraphEntity { + private List list; + private Double xbar; + private Double rsbar; + + public XMRGraphEntity(List list, Double xbar, Double rsbar){ + this.list = list; + this.rsbar = rsbar; + + this.xbar = xbar; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Double getXbar() { + return xbar; + } + + public void setXbar(Double xbar) { + this.xbar = xbar; + } + + public Double getRsbar() { + return rsbar; + } + + public void setRsbar(Double rsbar) { + this.rsbar = rsbar; + } +} diff --git a/ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/entity/XMRPoint.java b/ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/entity/XMRPoint.java new file mode 100644 index 0000000..d47b8e7 --- /dev/null +++ b/ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/entity/XMRPoint.java @@ -0,0 +1,95 @@ +package com.cnbm.qualityPlanning.entity; + +import java.util.Set; + +/** + * @Desc: "整合，处理好 后的一行数据 (sampleSize 后的数据) " + * @Author: caixiang + * @DATE: 2022/7/21 9:43 + */ +public class XMRPoint extends Point { + + private Double x; + private Double rs; + //position 是这个数据在数组中的位置 ；； value 是待被判读方案 分析的value（从 xbar、s、r 中选一） + public XMRPoint(Integer position, Double value) { + super(position, value); + } + //r 不满足 的 判读方案 + private Set xUnsatisfiedRules; + //xbar 不满足 的 判读方案 + private Set rsUnsatisfiedRules; + + + private void setValueToTest(Double value){ + setValueForInterpretation(value); + } + + public Set getxUnsatisfiedRules() { + return xUnsatisfiedRules; + } + + public void setxUnsatisfiedRules(Set xUnsatisfiedRules) { + this.xUnsatisfiedRules = xUnsatisfiedRules; + } + + public Set getRsUnsatisfiedRules() { + return rsUnsatisfiedRules; + } + + public void setRsUnsatisfiedRules(Set rsUnsatisfiedRules) { + this.rsUnsatisfiedRules = rsUnsatisfiedRules; + } + + public Double getX() { + return x; + } + + public void setX(Double x) { + this.x = x; + } + + public Double getRs() { + return rs; + } + + public void setRs(Double rs) { + this.rs = rs; + } + + public XMRPoint(Integer position, Double value, Double x, Double rs) { + super(position,value); + this.x = x; + this.rs = rs; + } + + @Override + public Integer getPosition() { + return super.getPosition(); + } + + @Override + public Double getValueForInterpretation() { + return super.getValueForInterpretation(); + } + + @Override + public Set getUnsatisfiedRules() { + return super.getUnsatisfiedRules(); + } + + @Override + public void setPosition(Integer position) { + super.setPosition(position); + } + + @Override + public void setValueForInterpretation(Double valueForInterpretation) { + super.setValueForInterpretation(valueForInterpretation); + } + + @Override + public void setUnsatisfiedRules(Set unsatisfiedRules) { + super.setUnsatisfiedRules(unsatisfiedRules); + } +} From 0750c9583e98f21691309ce86e33700cc94cb7dc Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Mon, 1 Aug 2022 13:42:54 +0800 Subject: [PATCH 3/3] mark --- .../java/com/cnbm/admin/basic/BaseParam.java | 18 ++++++++++ .../com/cnbm/admin/config/SecurityConfig.java | 1 + .../java/com/cnbm/admin/params/IdParam.java | 36 +++++++++++++++++++ .../basic/controller/MachineController.java | 2 +- .../basic/controller/ProductController.java | 9 ++--- .../service/impl/MachineServiceImpl.java | 2 ++ .../java/com/cnbm/influx/template/Event.java | 2 +- .../cnbm/influx/template/EventForCount.java | 31 ++++++++++++++++ .../ProcessInspectionController.java | 6 ++-- .../processInspection/dto/XMRGraphData.java | 2 +- .../processInspection/dto/XbarRGraphData.java | 2 +- .../processInspection/dto/XbarSGraphData.java | 2 +- .../{ => forMeterage}/mr/MRGraphEntity.java | 2 +- .../{ => forMeterage}/mr/MeanRGraph.java | 4 +-- .../{ => forMeterage}/ms/MSDGraphEntity.java | 2 +- .../ms/MeanStandardDeviationGraph.java | 4 +-- .../{ => forMeterage}/xmr/XMRGraph.java | 4 +-- .../{ => forMeterage}/xmr/XMRGraphEntity.java | 2 +- 18 files changed, 107 insertions(+), 24 deletions(-) create mode 100644 ym-admin/src/main/java/com/cnbm/admin/basic/BaseParam.java create mode 100644 ym-admin/src/main/java/com/cnbm/admin/params/IdParam.java create mode 100644 ym-influx/src/main/java/com/cnbm/influx/template/EventForCount.java rename ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/{ => forMeterage}/mr/MRGraphEntity.java (93%) rename ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/{ => forMeterage}/mr/MeanRGraph.java (99%) rename ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/{ => forMeterage}/ms/MSDGraphEntity.java (94%) rename ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/{ => forMeterage}/ms/MeanStandardDeviationGraph.java (99%) rename ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/{ => forMeterage}/xmr/XMRGraph.java (99%) rename ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/{ => forMeterage}/xmr/XMRGraphEntity.java (93%) diff --git a/ym-admin/src/main/java/com/cnbm/admin/basic/BaseParam.java b/ym-admin/src/main/java/com/cnbm/admin/basic/BaseParam.java new file mode 100644 index 0000000..81237d3 --- /dev/null +++ b/ym-admin/src/main/java/com/cnbm/admin/basic/BaseParam.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2018. + * http://www.ulabcare.com + */ + +package com.cnbm.admin.basic; + +import java.io.Serializable; + +/** + * 接口请求参数基类 + * + * @author jiff + * @date 2018/11/1 + * @since 1.0 + */ +public class BaseParam implements Serializable { +} diff --git a/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java b/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java index 2203625..2b39550 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java +++ b/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java @@ -73,6 +73,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/webjars/**", "/websocket/**", "/influx/**", + "/basic/**", "/processInspection/**", "/captcha").anonymous() // .antMatchers("/testCors").hasAuthority("system:dept:list222") diff --git a/ym-admin/src/main/java/com/cnbm/admin/params/IdParam.java b/ym-admin/src/main/java/com/cnbm/admin/params/IdParam.java new file mode 100644 index 0000000..8bf2d6a --- /dev/null +++ b/ym-admin/src/main/java/com/cnbm/admin/params/IdParam.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2018. + * http://www.ulabcare.com + */ + +package com.cnbm.admin.params; + + +import com.cnbm.admin.basic.BaseParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +/** + * 主键请求参数对象 + * + * @author jiff + * @date 2018/11/9 + * @since 1.0 + */ +@Data +@ApiModel("主键参数对象") +public class IdParam implements Serializable { + private static final long serialVersionUID = 1L; + + @NotNull(message = "主键不能为空") + @ApiModelProperty(value = "主键", required = true, example = "1", notes = "根据实际接口传递不同对象的主键") + private Long id; + +} diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java index e749ca8..b39272e 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java @@ -119,7 +119,7 @@ public class MachineController { public Result changeStatus(@PathVariable("id") Long id){ machineService.changeStatus(id); - return new Result(); + return new Result().ok(true); } } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java index eb5be8c..17b6d79 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -34,7 +35,7 @@ import java.util.Map; * @since 2022-07-11 */ @RestController -@RequestMapping("/code/product") +@RequestMapping("/basic/product") @Api(tags="产品 表") public class ProductController { @Autowired @@ -113,11 +114,11 @@ public class ProductController { ExcelUtils.exportExcelToTarget(response, null, list, ProductExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - productService.changeStatus(id); + public Result changeStatus(@RequestBody IdParam id){ + productService.changeStatus(id.getId()); return new Result(); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java index ddf9fc7..c36e011 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java @@ -90,6 +90,8 @@ public class MachineServiceImpl extends CrudServiceImpl