mark for pull

2022-11-25 10:12:33 +08:00
parent 7abcafb93d
commit bd9276036b
15 changed files with 1002 additions and 45 deletions
--- 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
@@ -6,10 +6,13 @@ 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;
+import com.cnbm.influx.config.InfluxClient;
 import com.cnbm.influx.constant.Constant;
 import com.cnbm.influx.param.QueryDataGroupByTimeParam;
 import com.cnbm.influx.param.QueryDataParam;
 import com.cnbm.influx.param.Range;
+import com.cnbm.influx.param.Tag;
+import com.cnbm.influx.template.Event;
 import com.cnbm.processInspection.dto.*;
 import com.cnbm.processInspection.graphAnalyzed.forCount.c.CGraph;
 import com.cnbm.processInspection.graphAnalyzed.forCount.np.NPGraph;
@@ -18,6 +21,8 @@ import com.cnbm.processInspection.graphAnalyzed.forCount.u.UGraph;
 import com.cnbm.processInspection.graphAnalyzed.forMeterage.mr.MeanRGraph;
 import com.cnbm.processInspection.graphAnalyzed.forMeterage.ms.MeanStandardDeviationGraph;
 import com.cnbm.processInspection.graphAnalyzed.forMeterage.xmr.XMRGraph;
+import com.influxdb.query.FluxRecord;
+import com.influxdb.query.FluxTable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -30,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;

@RestController
@RequestMapping("/processInspection")
@@ -46,7 +52,7 @@ public class ProcessInspectionController {
        productFeatures.setUsl(new Float(10));
        productFeatures.setLsl(new Float(1));

-        productFeatures.setName("LTWeight");
+        productFeatures.setName("LostDays");
        productFeatures.setSampleSize(10);
        MeanStandardDeviationGraph meanStandardDeviationGraph = new MeanStandardDeviationGraph(productFeatures);
        //判读方案
@@ -58,7 +64,7 @@ public class ProcessInspectionController {

        QueryDataParam queryDataParam = new QueryDataParam();
        queryDataParam.setMeasurement(Constant.measurement);
-        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now()));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
        meanStandardDeviationGraph.initialDate(queryDataParam);

        XbarSGraphData xbarSGraphData = new XbarSGraphData(
@@ -75,12 +81,13 @@ public class ProcessInspectionController {

    @PostMapping("/XbarRGraphTest")
    public R<XbarRGraphData> XbarRGraphTest() throws Exception {
+        //todo SL/USL/LSL 和 sampleSize 需要从外面传过来。
        ProductFeatures productFeatures = new ProductFeatures();
        productFeatures.setSl(new Float(5));
        productFeatures.setUsl(new Float(10));
        productFeatures.setLsl(new Float(1));

-        productFeatures.setName("LTWeight");
+        productFeatures.setName("LostDays");
        productFeatures.setSampleSize(10);
        MeanRGraph meanRGraph = new MeanRGraph(productFeatures);
        //判读方案
@@ -92,7 +99,7 @@ public class ProcessInspectionController {

        QueryDataParam queryDataParam = new QueryDataParam();
        queryDataParam.setMeasurement(Constant.measurement);
-        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now()));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
        meanRGraph.initialDate(queryDataParam);

        XbarRGraphData xbarSGraphData = new XbarRGraphData(
@@ -113,7 +120,7 @@ public class ProcessInspectionController {
        productFeatures.setUsl(new Float(10));
        productFeatures.setLsl(new Float(1));

-        productFeatures.setName("LTWeight");
+        productFeatures.setName("LostDays");
        productFeatures.setSampleSize(1);
        XMRGraph xmrGraph = new XMRGraph(productFeatures);
        //判读方案
@@ -125,7 +132,7 @@ public class ProcessInspectionController {

        QueryDataParam queryDataParam = new QueryDataParam();
        queryDataParam.setMeasurement(Constant.measurement);
-        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now()));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
        xmrGraph.initialDate(queryDataParam);

        XMRGraphData xmrGraphData = new XMRGraphData(
@@ -139,6 +146,45 @@ public class ProcessInspectionController {

        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.setTag(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")
    public R<NPGraphData> NPGraphTest() throws Exception {
        ProductFeatures productFeatures = new ProductFeatures();
@@ -152,7 +198,7 @@ public class ProcessInspectionController {

        QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
        queryDataParam.setMeasurement(Constant.measurement);
-        queryDataParam.setRange(new Range( Instant.now() , DataUtils.getAfterDate(999).toInstant() ));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
        queryDataParam.setTimeType(1);
        npGraph.initialDate(queryDataParam);

@@ -177,7 +223,7 @@ public class ProcessInspectionController {

        QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
        queryDataParam.setMeasurement(Constant.measurement);
-        queryDataParam.setRange(new Range( Instant.now() , DataUtils.getAfterDate(999).toInstant() ));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
        queryDataParam.setTimeType(2);
        pGraph.initialDate(queryDataParam);

@@ -201,8 +247,10 @@ public class ProcessInspectionController {


        QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
+        //到时候 要看前端 传的，这里的measurement 其实就是 设备名。
        queryDataParam.setMeasurement(Constant.measurement);
-        queryDataParam.setRange(new Range( Instant.now() , DataUtils.getAfterDate(999).toInstant() ));
+//        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(), Instant.now()));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
        queryDataParam.setTimeType(2);
        cGraph.initialDate(queryDataParam);

@@ -228,7 +276,7 @@ public class ProcessInspectionController {

        QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
        queryDataParam.setMeasurement(Constant.measurement);
-        queryDataParam.setRange(new Range( Instant.now() , DataUtils.getAfterDate(999).toInstant() ));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant() ));
        queryDataParam.setTimeType(2);
        uGraph.initialDate(queryDataParam);

--- 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
@@ -15,7 +15,7 @@ import lombok.Data;
 * @DATE: 2022/7/22 14:18
 */
@Data
-@ApiModel(value = "均值极差控制图 结果类")
+@ApiModel(value = "单值-移动极差 结果类")
 public class XMRGraphData {
    @ApiModelProperty(value = "控制图list数据")
    private XMRGraphEntity xmrGraphEntity;
--- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XbarRGraphData.java
+++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XbarRGraphData.java
@@ -15,7 +15,7 @@ import lombok.Data;
 * @DATE: 2022/7/22 14:18
 */
@Data
-@ApiModel(value = "均值极差控制图 结果类")
+@ApiModel(value = "均值-极差控制图 结果类")
 public class XbarRGraphData {
    @ApiModelProperty(value = "控制图list数据")
    private MRGraphEntity mrGraphEntity;
--- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XbarSGraphData.java
+++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/XbarSGraphData.java
@@ -15,7 +15,7 @@ import lombok.Data;
 * @DATE: 2022/7/22 14:18
 */
@Data
-@ApiModel(value = "均值标准差控制图 结果类")
+@ApiModel(value = "均值-标准差控制图 结果类")
 public class XbarSGraphData {
    @ApiModelProperty(value = "控制图list数据")
    private MSDGraphEntity msdGraphEntity;