cvt算法

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVCvtFeignClient.java

@@ -0,0 +1,27 @@
+package com.njcn.dataProcess.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.dataProcess.api.fallback.DataHarmRateVCvtFeignClientFallbackFactory;
+import com.njcn.dataProcess.api.fallback.DataVCvtFeignClientFallbackFactory;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmRateVCvtDto;
+import com.njcn.dataProcess.pojo.dto.DataVCvtDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+
+@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmRateVCvt", fallbackFactory = DataHarmRateVCvtFeignClientFallbackFactory.class, contextId = "dataVCvt")
+public interface DataHarmRateVCvtFeignClient {
+
+
+    //获取原始数据
+    @PostMapping("/getRawData")
+    HttpResult<List<DataHarmRateVCvtDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
+
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVCvtFeignClientFallbackFactory.java

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.dataProcess.api.DataHarmRateVCvtFeignClient;
+import com.njcn.dataProcess.api.DataVCvtFeignClient;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmRateVCvtDto;
+import com.njcn.dataProcess.pojo.dto.DataVCvtDto;
+import com.njcn.dataProcess.util.DataProcessingEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年01月05日 15:08
+ */
+@Slf4j
+@Component
+public class DataHarmRateVCvtFeignClientFallbackFactory implements FallbackFactory<DataHarmRateVCvtFeignClient> {
+
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public DataHarmRateVCvtFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if(cause.getCause() instanceof BusinessException){
+            BusinessException businessException = (BusinessException) cause.getCause();
+            exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new DataHarmRateVCvtFeignClient() {
+
+
+            @Override
+            public HttpResult<List<DataHarmRateVCvtDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+        };
+    }
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmRateVCvt.java

@@ -0,0 +1,428 @@
+package com.njcn.dataProcess.po.influx;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.njcn.dataProcess.dto.DataHarmrateVDTO;
+import com.njcn.influx.utils.InstantDateSerializer;
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+import org.influxdb.annotation.TimeColumn;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/5/12 11:27
+ */
+@Data
+@Measurement(name = "data_harmrate_v_cvt")
+public class DataHarmRateVCvt {
+    @TimeColumn
+    @Column(name = "time",tag = true)
+    @JsonSerialize(using = InstantDateSerializer.class)
+    private Instant time;
+
+    @Column(name = "line_id",tag = true)
+    private String lineId;
+
+    @Column(name = "phasic_type",tag = true)
+    private String phasicType;
+
+    @Column(name = "quality_flag",tag = true)
+    private String qualityFlag="0";
+
+    @Column(name = "value_type",tag = true)
+    private String valueType;
+
+    @Column(name = "v_1")
+    private Double v1;
+
+    @Column(name = "v_2")
+    private Double v2;
+
+    @Column(name = "v_3")
+    private Double v3;
+
+    @Column(name = "v_4")
+    private Double v4;
+
+    @Column(name = "v_5")
+    private Double v5;
+
+    @Column(name = "v_6")
+    private Double v6;
+
+    @Column(name = "v_7")
+    private Double v7;
+
+    @Column(name = "v_8")
+    private Double v8;
+
+    @Column(name = "v_9")
+    private Double v9;
+
+    @Column(name = "v_10")
+    private Double v10;
+
+    @Column(name = "v_11")
+    private Double v11;
+
+    @Column(name = "v_12")
+    private Double v12;
+
+    @Column(name = "v_13")
+    private Double v13;
+
+    @Column(name = "v_14")
+    private Double v14;
+
+    @Column(name = "v_15")
+    private Double v15;
+
+    @Column(name = "v_16")
+    private Double v16;
+
+    @Column(name = "v_17")
+    private Double v17;
+
+    @Column(name = "v_18")
+    private Double v18;
+
+    @Column(name = "v_19")
+    private Double v19;
+
+    @Column(name = "v_20")
+    private Double v20;
+
+    @Column(name = "v_21")
+    private Double v21;
+
+    @Column(name = "v_22")
+    private Double v22;
+
+    @Column(name = "v_23")
+    private Double v23;
+
+    @Column(name = "v_24")
+    private Double v24;
+
+    @Column(name = "v_25")
+    private Double v25;
+
+    @Column(name = "v_26")
+    private Double v26;
+
+    @Column(name = "v_27")
+    private Double v27;
+
+    @Column(name = "v_28")
+    private Double v28;
+
+    @Column(name = "v_29")
+    private Double v29;
+
+    @Column(name = "v_30")
+    private Double v30;
+
+    @Column(name = "v_31")
+    private Double v31;
+
+    @Column(name = "v_32")
+    private Double v32;
+
+    @Column(name = "v_33")
+    private Double v33;
+
+    @Column(name = "v_34")
+    private Double v34;
+
+    @Column(name = "v_35")
+    private Double v35;
+
+    @Column(name = "v_36")
+    private Double v36;
+
+    @Column(name = "v_37")
+    private Double v37;
+
+    @Column(name = "v_38")
+    private Double v38;
+
+    @Column(name = "v_39")
+    private Double v39;
+
+    @Column(name = "v_40")
+    private Double v40;
+
+    @Column(name = "v_41")
+    private Double v41;
+
+    @Column(name = "v_42")
+    private Double v42;
+
+    @Column(name = "v_43")
+    private Double v43;
+
+    @Column(name = "v_44")
+    private Double v44;
+
+    @Column(name = "v_45")
+    private Double v45;
+
+    @Column(name = "v_46")
+    private Double v46;
+
+    @Column(name = "v_47")
+    private Double v47;
+
+    @Column(name = "v_48")
+    private Double v48;
+
+    @Column(name = "v_49")
+    private Double v49;
+
+    @Column(name = "v_50")
+    private Double v50;
+
+    public static List<DataHarmRateVCvt> relationToInfluxDB(DataHarmrateVDTO dataHarmrateV) {
+        if (dataHarmrateV == null) {
+            return null;
+        }
+        List<DataHarmRateVCvt> influxDBDataHarmRateVList = new ArrayList<>();
+        List<String> valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList());
+        for (String valueType : valueTypeList) {
+            DataHarmRateVCvt influxDBDataHarmRateV = new DataHarmRateVCvt();
+            Instant instant = dataHarmrateV.getTimeid().atZone(ZoneId.systemDefault()).toInstant();
+
+            influxDBDataHarmRateV.setTime(instant);
+            influxDBDataHarmRateV.setLineId(dataHarmrateV.getLineid());
+            influxDBDataHarmRateV.setPhasicType(dataHarmrateV.getPhasicType());
+            influxDBDataHarmRateV.setQualityFlag(dataHarmrateV.getQualityflag()+"");
+            influxDBDataHarmRateV.setValueType(valueType);
+            if (valueType.equals("AVG")) {
+                influxDBDataHarmRateV.setV1(Objects.isNull(dataHarmrateV.getV1())?0.00:dataHarmrateV.getV1());
+                influxDBDataHarmRateV.setV2(Objects.isNull(dataHarmrateV.getV2())?0.00:dataHarmrateV.getV2());
+                influxDBDataHarmRateV.setV3(Objects.isNull(dataHarmrateV.getV3())?0.00:dataHarmrateV.getV3());
+                influxDBDataHarmRateV.setV4(Objects.isNull(dataHarmrateV.getV4())?0.00:dataHarmrateV.getV4());
+                influxDBDataHarmRateV.setV5(Objects.isNull(dataHarmrateV.getV5())?0.00:dataHarmrateV.getV5());
+                influxDBDataHarmRateV.setV6(Objects.isNull(dataHarmrateV.getV6())?0.00:dataHarmrateV.getV6());
+                influxDBDataHarmRateV.setV7(Objects.isNull(dataHarmrateV.getV7())?0.00:dataHarmrateV.getV7());
+                influxDBDataHarmRateV.setV8(Objects.isNull(dataHarmrateV.getV8())?0.00:dataHarmrateV.getV8());
+                influxDBDataHarmRateV.setV9(Objects.isNull(dataHarmrateV.getV9())?0.00:dataHarmrateV.getV9());
+                influxDBDataHarmRateV.setV10(Objects.isNull(dataHarmrateV.getV10())?0.00:dataHarmrateV.getV10());
+                influxDBDataHarmRateV.setV11(Objects.isNull(dataHarmrateV.getV11())?0.00:dataHarmrateV.getV11());
+                influxDBDataHarmRateV.setV12(Objects.isNull(dataHarmrateV.getV12())?0.00:dataHarmrateV.getV12());
+                influxDBDataHarmRateV.setV13(Objects.isNull(dataHarmrateV.getV13())?0.00:dataHarmrateV.getV13());
+                influxDBDataHarmRateV.setV14(Objects.isNull(dataHarmrateV.getV14())?0.00:dataHarmrateV.getV14());
+                influxDBDataHarmRateV.setV15(Objects.isNull(dataHarmrateV.getV15())?0.00:dataHarmrateV.getV15());
+                influxDBDataHarmRateV.setV16(Objects.isNull(dataHarmrateV.getV16())?0.00:dataHarmrateV.getV16());
+                influxDBDataHarmRateV.setV17(Objects.isNull(dataHarmrateV.getV17())?0.00:dataHarmrateV.getV17());
+                influxDBDataHarmRateV.setV18(Objects.isNull(dataHarmrateV.getV18())?0.00:dataHarmrateV.getV18());
+                influxDBDataHarmRateV.setV19(Objects.isNull(dataHarmrateV.getV19())?0.00:dataHarmrateV.getV19());
+                influxDBDataHarmRateV.setV20(Objects.isNull(dataHarmrateV.getV20())?0.00:dataHarmrateV.getV20());
+                influxDBDataHarmRateV.setV21(Objects.isNull(dataHarmrateV.getV21())?0.00:dataHarmrateV.getV21());
+                influxDBDataHarmRateV.setV22(Objects.isNull(dataHarmrateV.getV22())?0.00:dataHarmrateV.getV22());
+                influxDBDataHarmRateV.setV23(Objects.isNull(dataHarmrateV.getV23())?0.00:dataHarmrateV.getV23());
+                influxDBDataHarmRateV.setV24(Objects.isNull(dataHarmrateV.getV24())?0.00:dataHarmrateV.getV24());
+                influxDBDataHarmRateV.setV25(Objects.isNull(dataHarmrateV.getV25())?0.00:dataHarmrateV.getV25());
+                influxDBDataHarmRateV.setV26(Objects.isNull(dataHarmrateV.getV26())?0.00:dataHarmrateV.getV26());
+                influxDBDataHarmRateV.setV27(Objects.isNull(dataHarmrateV.getV27())?0.00:dataHarmrateV.getV27());
+                influxDBDataHarmRateV.setV28(Objects.isNull(dataHarmrateV.getV28())?0.00:dataHarmrateV.getV28());
+                influxDBDataHarmRateV.setV29(Objects.isNull(dataHarmrateV.getV29())?0.00:dataHarmrateV.getV29());
+                influxDBDataHarmRateV.setV30(Objects.isNull(dataHarmrateV.getV30())?0.00:dataHarmrateV.getV30());
+                influxDBDataHarmRateV.setV31(Objects.isNull(dataHarmrateV.getV31())?0.00:dataHarmrateV.getV31());
+                influxDBDataHarmRateV.setV32(Objects.isNull(dataHarmrateV.getV32())?0.00:dataHarmrateV.getV32());
+                influxDBDataHarmRateV.setV33(Objects.isNull(dataHarmrateV.getV33())?0.00:dataHarmrateV.getV33());
+                influxDBDataHarmRateV.setV34(Objects.isNull(dataHarmrateV.getV34())?0.00:dataHarmrateV.getV34());
+                influxDBDataHarmRateV.setV35(Objects.isNull(dataHarmrateV.getV35())?0.00:dataHarmrateV.getV35());
+                influxDBDataHarmRateV.setV36(Objects.isNull(dataHarmrateV.getV36())?0.00:dataHarmrateV.getV36());
+                influxDBDataHarmRateV.setV37(Objects.isNull(dataHarmrateV.getV37())?0.00:dataHarmrateV.getV37());
+                influxDBDataHarmRateV.setV38(Objects.isNull(dataHarmrateV.getV38())?0.00:dataHarmrateV.getV38());
+                influxDBDataHarmRateV.setV39(Objects.isNull(dataHarmrateV.getV39())?0.00:dataHarmrateV.getV39());
+                influxDBDataHarmRateV.setV40(Objects.isNull(dataHarmrateV.getV40())?0.00:dataHarmrateV.getV40());
+                influxDBDataHarmRateV.setV41(Objects.isNull(dataHarmrateV.getV41())?0.00:dataHarmrateV.getV41());
+                influxDBDataHarmRateV.setV42(Objects.isNull(dataHarmrateV.getV42())?0.00:dataHarmrateV.getV42());
+                influxDBDataHarmRateV.setV43(Objects.isNull(dataHarmrateV.getV43())?0.00:dataHarmrateV.getV43());
+                influxDBDataHarmRateV.setV44(Objects.isNull(dataHarmrateV.getV44())?0.00:dataHarmrateV.getV44());
+                influxDBDataHarmRateV.setV45(Objects.isNull(dataHarmrateV.getV45())?0.00:dataHarmrateV.getV45());
+                influxDBDataHarmRateV.setV46(Objects.isNull(dataHarmrateV.getV46())?0.00:dataHarmrateV.getV46());
+                influxDBDataHarmRateV.setV47(Objects.isNull(dataHarmrateV.getV47())?0.00:dataHarmrateV.getV47());
+                influxDBDataHarmRateV.setV48(Objects.isNull(dataHarmrateV.getV48())?0.00:dataHarmrateV.getV48());
+                influxDBDataHarmRateV.setV49(Objects.isNull(dataHarmrateV.getV49())?0.00:dataHarmrateV.getV49());
+                influxDBDataHarmRateV.setV50(Objects.isNull(dataHarmrateV.getV50())?0.00:dataHarmrateV.getV50());
+            }
+            else if (valueType.equals("MAX")){
+                influxDBDataHarmRateV.setV1(Objects.isNull(dataHarmrateV.getV1Max())?0.00:dataHarmrateV.getV1Max());
+                influxDBDataHarmRateV.setV2(Objects.isNull(dataHarmrateV.getV2Max())?0.00:dataHarmrateV.getV2Max());
+                influxDBDataHarmRateV.setV3(Objects.isNull(dataHarmrateV.getV3Max())?0.00:dataHarmrateV.getV3Max());
+                influxDBDataHarmRateV.setV4(Objects.isNull(dataHarmrateV.getV4Max())?0.00:dataHarmrateV.getV4Max());
+                influxDBDataHarmRateV.setV5(Objects.isNull(dataHarmrateV.getV5Max())?0.00:dataHarmrateV.getV5Max());
+                influxDBDataHarmRateV.setV6(Objects.isNull(dataHarmrateV.getV6Max())?0.00:dataHarmrateV.getV6Max());
+                influxDBDataHarmRateV.setV7(Objects.isNull(dataHarmrateV.getV7Max())?0.00:dataHarmrateV.getV7Max());
+                influxDBDataHarmRateV.setV8(Objects.isNull(dataHarmrateV.getV8Max())?0.00:dataHarmrateV.getV8Max());
+                influxDBDataHarmRateV.setV9(Objects.isNull(dataHarmrateV.getV9Max())?0.00:dataHarmrateV.getV9Max());
+                influxDBDataHarmRateV.setV10(Objects.isNull(dataHarmrateV.getV10Max())?0.00:dataHarmrateV.getV10Max());
+                influxDBDataHarmRateV.setV11(Objects.isNull(dataHarmrateV.getV11Max())?0.00:dataHarmrateV.getV11Max());
+                influxDBDataHarmRateV.setV12(Objects.isNull(dataHarmrateV.getV12Max())?0.00:dataHarmrateV.getV12Max());
+                influxDBDataHarmRateV.setV13(Objects.isNull(dataHarmrateV.getV13Max())?0.00:dataHarmrateV.getV13Max());
+                influxDBDataHarmRateV.setV14(Objects.isNull(dataHarmrateV.getV14Max())?0.00:dataHarmrateV.getV14Max());
+                influxDBDataHarmRateV.setV15(Objects.isNull(dataHarmrateV.getV15Max())?0.00:dataHarmrateV.getV15Max());
+                influxDBDataHarmRateV.setV16(Objects.isNull(dataHarmrateV.getV16Max())?0.00:dataHarmrateV.getV16Max());
+                influxDBDataHarmRateV.setV17(Objects.isNull(dataHarmrateV.getV17Max())?0.00:dataHarmrateV.getV17Max());
+                influxDBDataHarmRateV.setV18(Objects.isNull(dataHarmrateV.getV18Max())?0.00:dataHarmrateV.getV18Max());
+                influxDBDataHarmRateV.setV19(Objects.isNull(dataHarmrateV.getV19Max())?0.00:dataHarmrateV.getV19Max());
+                influxDBDataHarmRateV.setV20(Objects.isNull(dataHarmrateV.getV20Max())?0.00:dataHarmrateV.getV20Max());
+                influxDBDataHarmRateV.setV21(Objects.isNull(dataHarmrateV.getV21Max())?0.00:dataHarmrateV.getV21Max());
+                influxDBDataHarmRateV.setV22(Objects.isNull(dataHarmrateV.getV22Max())?0.00:dataHarmrateV.getV22Max());
+                influxDBDataHarmRateV.setV23(Objects.isNull(dataHarmrateV.getV23Max())?0.00:dataHarmrateV.getV23Max());
+                influxDBDataHarmRateV.setV24(Objects.isNull(dataHarmrateV.getV24Max())?0.00:dataHarmrateV.getV24Max());
+                influxDBDataHarmRateV.setV25(Objects.isNull(dataHarmrateV.getV25Max())?0.00:dataHarmrateV.getV25Max());
+                influxDBDataHarmRateV.setV26(Objects.isNull(dataHarmrateV.getV26Max())?0.00:dataHarmrateV.getV26Max());
+                influxDBDataHarmRateV.setV27(Objects.isNull(dataHarmrateV.getV27Max())?0.00:dataHarmrateV.getV27Max());
+                influxDBDataHarmRateV.setV28(Objects.isNull(dataHarmrateV.getV28Max())?0.00:dataHarmrateV.getV28Max());
+                influxDBDataHarmRateV.setV29(Objects.isNull(dataHarmrateV.getV29Max())?0.00:dataHarmrateV.getV29Max());
+                influxDBDataHarmRateV.setV30(Objects.isNull(dataHarmrateV.getV30Max())?0.00:dataHarmrateV.getV30Max());
+                influxDBDataHarmRateV.setV31(Objects.isNull(dataHarmrateV.getV31Max())?0.00:dataHarmrateV.getV31Max());
+                influxDBDataHarmRateV.setV32(Objects.isNull(dataHarmrateV.getV32Max())?0.00:dataHarmrateV.getV32Max());
+                influxDBDataHarmRateV.setV33(Objects.isNull(dataHarmrateV.getV33Max())?0.00:dataHarmrateV.getV33Max());
+                influxDBDataHarmRateV.setV34(Objects.isNull(dataHarmrateV.getV34Max())?0.00:dataHarmrateV.getV34Max());
+                influxDBDataHarmRateV.setV35(Objects.isNull(dataHarmrateV.getV35Max())?0.00:dataHarmrateV.getV35Max());
+                influxDBDataHarmRateV.setV36(Objects.isNull(dataHarmrateV.getV36Max())?0.00:dataHarmrateV.getV36Max());
+                influxDBDataHarmRateV.setV37(Objects.isNull(dataHarmrateV.getV37Max())?0.00:dataHarmrateV.getV37Max());
+                influxDBDataHarmRateV.setV38(Objects.isNull(dataHarmrateV.getV38Max())?0.00:dataHarmrateV.getV38Max());
+                influxDBDataHarmRateV.setV39(Objects.isNull(dataHarmrateV.getV39Max())?0.00:dataHarmrateV.getV39Max());
+                influxDBDataHarmRateV.setV40(Objects.isNull(dataHarmrateV.getV40Max())?0.00:dataHarmrateV.getV40Max());
+                influxDBDataHarmRateV.setV41(Objects.isNull(dataHarmrateV.getV41Max())?0.00:dataHarmrateV.getV41Max());
+                influxDBDataHarmRateV.setV42(Objects.isNull(dataHarmrateV.getV42Max())?0.00:dataHarmrateV.getV42Max());
+                influxDBDataHarmRateV.setV43(Objects.isNull(dataHarmrateV.getV43Max())?0.00:dataHarmrateV.getV43Max());
+                influxDBDataHarmRateV.setV44(Objects.isNull(dataHarmrateV.getV44Max())?0.00:dataHarmrateV.getV44Max());
+                influxDBDataHarmRateV.setV45(Objects.isNull(dataHarmrateV.getV45Max())?0.00:dataHarmrateV.getV45Max());
+                influxDBDataHarmRateV.setV46(Objects.isNull(dataHarmrateV.getV46Max())?0.00:dataHarmrateV.getV46Max());
+                influxDBDataHarmRateV.setV47(Objects.isNull(dataHarmrateV.getV47Max())?0.00:dataHarmrateV.getV47Max());
+                influxDBDataHarmRateV.setV48(Objects.isNull(dataHarmrateV.getV48Max())?0.00:dataHarmrateV.getV48Max());
+                influxDBDataHarmRateV.setV49(Objects.isNull(dataHarmrateV.getV49Max())?0.00:dataHarmrateV.getV49Max());
+                influxDBDataHarmRateV.setV50(Objects.isNull(dataHarmrateV.getV50Max())?0.00:dataHarmrateV.getV50Max());
+            }
+            else if (valueType.equals("MIN")){
+                influxDBDataHarmRateV.setV1(Objects.isNull(dataHarmrateV.getV1Min())?0.00:dataHarmrateV.getV1Min());
+                influxDBDataHarmRateV.setV2(Objects.isNull(dataHarmrateV.getV2Min())?0.00:dataHarmrateV.getV2Min());
+                influxDBDataHarmRateV.setV3(Objects.isNull(dataHarmrateV.getV3Min())?0.00:dataHarmrateV.getV3Min());
+                influxDBDataHarmRateV.setV4(Objects.isNull(dataHarmrateV.getV4Min())?0.00:dataHarmrateV.getV4Min());
+                influxDBDataHarmRateV.setV5(Objects.isNull(dataHarmrateV.getV5Min())?0.00:dataHarmrateV.getV5Min());
+                influxDBDataHarmRateV.setV6(Objects.isNull(dataHarmrateV.getV6Min())?0.00:dataHarmrateV.getV6Min());
+                influxDBDataHarmRateV.setV7(Objects.isNull(dataHarmrateV.getV7Min())?0.00:dataHarmrateV.getV7Min());
+                influxDBDataHarmRateV.setV8(Objects.isNull(dataHarmrateV.getV8Min())?0.00:dataHarmrateV.getV8Min());
+                influxDBDataHarmRateV.setV9(Objects.isNull(dataHarmrateV.getV9Min())?0.00:dataHarmrateV.getV9Min());
+                influxDBDataHarmRateV.setV10(Objects.isNull(dataHarmrateV.getV10Min())?0.00:dataHarmrateV.getV10Min());
+                influxDBDataHarmRateV.setV11(Objects.isNull(dataHarmrateV.getV11Min())?0.00:dataHarmrateV.getV11Min());
+                influxDBDataHarmRateV.setV12(Objects.isNull(dataHarmrateV.getV12Min())?0.00:dataHarmrateV.getV12Min());
+                influxDBDataHarmRateV.setV13(Objects.isNull(dataHarmrateV.getV13Min())?0.00:dataHarmrateV.getV13Min());
+                influxDBDataHarmRateV.setV14(Objects.isNull(dataHarmrateV.getV14Min())?0.00:dataHarmrateV.getV14Min());
+                influxDBDataHarmRateV.setV15(Objects.isNull(dataHarmrateV.getV15Min())?0.00:dataHarmrateV.getV15Min());
+                influxDBDataHarmRateV.setV16(Objects.isNull(dataHarmrateV.getV16Min())?0.00:dataHarmrateV.getV16Min());
+                influxDBDataHarmRateV.setV17(Objects.isNull(dataHarmrateV.getV17Min())?0.00:dataHarmrateV.getV17Min());
+                influxDBDataHarmRateV.setV18(Objects.isNull(dataHarmrateV.getV18Min())?0.00:dataHarmrateV.getV18Min());
+                influxDBDataHarmRateV.setV19(Objects.isNull(dataHarmrateV.getV19Min())?0.00:dataHarmrateV.getV19Min());
+                influxDBDataHarmRateV.setV20(Objects.isNull(dataHarmrateV.getV20Min())?0.00:dataHarmrateV.getV20Min());
+                influxDBDataHarmRateV.setV21(Objects.isNull(dataHarmrateV.getV21Min())?0.00:dataHarmrateV.getV21Min());
+                influxDBDataHarmRateV.setV22(Objects.isNull(dataHarmrateV.getV22Min())?0.00:dataHarmrateV.getV22Min());
+                influxDBDataHarmRateV.setV23(Objects.isNull(dataHarmrateV.getV23Min())?0.00:dataHarmrateV.getV23Min());
+                influxDBDataHarmRateV.setV24(Objects.isNull(dataHarmrateV.getV24Min())?0.00:dataHarmrateV.getV24Min());
+                influxDBDataHarmRateV.setV25(Objects.isNull(dataHarmrateV.getV25Min())?0.00:dataHarmrateV.getV25Min());
+                influxDBDataHarmRateV.setV26(Objects.isNull(dataHarmrateV.getV26Min())?0.00:dataHarmrateV.getV26Min());
+                influxDBDataHarmRateV.setV27(Objects.isNull(dataHarmrateV.getV27Min())?0.00:dataHarmrateV.getV27Min());
+                influxDBDataHarmRateV.setV28(Objects.isNull(dataHarmrateV.getV28Min())?0.00:dataHarmrateV.getV28Min());
+                influxDBDataHarmRateV.setV29(Objects.isNull(dataHarmrateV.getV29Min())?0.00:dataHarmrateV.getV29Min());
+                influxDBDataHarmRateV.setV30(Objects.isNull(dataHarmrateV.getV30Min())?0.00:dataHarmrateV.getV30Min());
+                influxDBDataHarmRateV.setV31(Objects.isNull(dataHarmrateV.getV31Min())?0.00:dataHarmrateV.getV31Min());
+                influxDBDataHarmRateV.setV32(Objects.isNull(dataHarmrateV.getV32Min())?0.00:dataHarmrateV.getV32Min());
+                influxDBDataHarmRateV.setV33(Objects.isNull(dataHarmrateV.getV33Min())?0.00:dataHarmrateV.getV33Min());
+                influxDBDataHarmRateV.setV34(Objects.isNull(dataHarmrateV.getV34Min())?0.00:dataHarmrateV.getV34Min());
+                influxDBDataHarmRateV.setV35(Objects.isNull(dataHarmrateV.getV35Min())?0.00:dataHarmrateV.getV35Min());
+                influxDBDataHarmRateV.setV36(Objects.isNull(dataHarmrateV.getV36Min())?0.00:dataHarmrateV.getV36Min());
+                influxDBDataHarmRateV.setV37(Objects.isNull(dataHarmrateV.getV37Min())?0.00:dataHarmrateV.getV37Min());
+                influxDBDataHarmRateV.setV38(Objects.isNull(dataHarmrateV.getV38Min())?0.00:dataHarmrateV.getV38Min());
+                influxDBDataHarmRateV.setV39(Objects.isNull(dataHarmrateV.getV39Min())?0.00:dataHarmrateV.getV39Min());
+                influxDBDataHarmRateV.setV40(Objects.isNull(dataHarmrateV.getV40Min())?0.00:dataHarmrateV.getV40Min());
+                influxDBDataHarmRateV.setV41(Objects.isNull(dataHarmrateV.getV41Min())?0.00:dataHarmrateV.getV41Min());
+                influxDBDataHarmRateV.setV42(Objects.isNull(dataHarmrateV.getV42Min())?0.00:dataHarmrateV.getV42Min());
+                influxDBDataHarmRateV.setV43(Objects.isNull(dataHarmrateV.getV43Min())?0.00:dataHarmrateV.getV43Min());
+                influxDBDataHarmRateV.setV44(Objects.isNull(dataHarmrateV.getV44Min())?0.00:dataHarmrateV.getV44Min());
+                influxDBDataHarmRateV.setV45(Objects.isNull(dataHarmrateV.getV45Min())?0.00:dataHarmrateV.getV45Min());
+                influxDBDataHarmRateV.setV46(Objects.isNull(dataHarmrateV.getV46Min())?0.00:dataHarmrateV.getV46Min());
+                influxDBDataHarmRateV.setV47(Objects.isNull(dataHarmrateV.getV47Min())?0.00:dataHarmrateV.getV47Min());
+                influxDBDataHarmRateV.setV48(Objects.isNull(dataHarmrateV.getV48Min())?0.00:dataHarmrateV.getV48Min());
+                influxDBDataHarmRateV.setV49(Objects.isNull(dataHarmrateV.getV49Min())?0.00:dataHarmrateV.getV49Min());
+                influxDBDataHarmRateV.setV50(Objects.isNull(dataHarmrateV.getV50Min())?0.00:dataHarmrateV.getV50Min());
+            }
+            else if (valueType.equals("CP95")){
+                influxDBDataHarmRateV.setV1(Objects.isNull(dataHarmrateV.getV1Cp95())?0.00:dataHarmrateV.getV1Cp95());
+                influxDBDataHarmRateV.setV2(Objects.isNull(dataHarmrateV.getV2Cp95())?0.00:dataHarmrateV.getV2Cp95());
+                influxDBDataHarmRateV.setV3(Objects.isNull(dataHarmrateV.getV3Cp95())?0.00:dataHarmrateV.getV3Cp95());
+                influxDBDataHarmRateV.setV4(Objects.isNull(dataHarmrateV.getV4Cp95())?0.00:dataHarmrateV.getV4Cp95());
+                influxDBDataHarmRateV.setV5(Objects.isNull(dataHarmrateV.getV5Cp95())?0.00:dataHarmrateV.getV5Cp95());
+                influxDBDataHarmRateV.setV6(Objects.isNull(dataHarmrateV.getV6Cp95())?0.00:dataHarmrateV.getV6Cp95());
+                influxDBDataHarmRateV.setV7(Objects.isNull(dataHarmrateV.getV7Cp95())?0.00:dataHarmrateV.getV7Cp95());
+                influxDBDataHarmRateV.setV8(Objects.isNull(dataHarmrateV.getV8Cp95())?0.00:dataHarmrateV.getV8Cp95());
+                influxDBDataHarmRateV.setV9(Objects.isNull(dataHarmrateV.getV9Cp95())?0.00:dataHarmrateV.getV9Cp95());
+                influxDBDataHarmRateV.setV10(Objects.isNull(dataHarmrateV.getV10Cp95())?0.00:dataHarmrateV.getV10Cp95());
+                influxDBDataHarmRateV.setV11(Objects.isNull(dataHarmrateV.getV11Cp95())?0.00:dataHarmrateV.getV11Cp95());
+                influxDBDataHarmRateV.setV12(Objects.isNull(dataHarmrateV.getV12Cp95())?0.00:dataHarmrateV.getV12Cp95());
+                influxDBDataHarmRateV.setV13(Objects.isNull(dataHarmrateV.getV13Cp95())?0.00:dataHarmrateV.getV13Cp95());
+                influxDBDataHarmRateV.setV14(Objects.isNull(dataHarmrateV.getV14Cp95())?0.00:dataHarmrateV.getV14Cp95());
+                influxDBDataHarmRateV.setV15(Objects.isNull(dataHarmrateV.getV15Cp95())?0.00:dataHarmrateV.getV15Cp95());
+                influxDBDataHarmRateV.setV16(Objects.isNull(dataHarmrateV.getV16Cp95())?0.00:dataHarmrateV.getV16Cp95());
+                influxDBDataHarmRateV.setV17(Objects.isNull(dataHarmrateV.getV17Cp95())?0.00:dataHarmrateV.getV17Cp95());
+                influxDBDataHarmRateV.setV18(Objects.isNull(dataHarmrateV.getV18Cp95())?0.00:dataHarmrateV.getV18Cp95());
+                influxDBDataHarmRateV.setV19(Objects.isNull(dataHarmrateV.getV19Cp95())?0.00:dataHarmrateV.getV19Cp95());
+                influxDBDataHarmRateV.setV20(Objects.isNull(dataHarmrateV.getV20Cp95())?0.00:dataHarmrateV.getV20Cp95());
+                influxDBDataHarmRateV.setV21(Objects.isNull(dataHarmrateV.getV21Cp95())?0.00:dataHarmrateV.getV21Cp95());
+                influxDBDataHarmRateV.setV22(Objects.isNull(dataHarmrateV.getV22Cp95())?0.00:dataHarmrateV.getV22Cp95());
+                influxDBDataHarmRateV.setV23(Objects.isNull(dataHarmrateV.getV23Cp95())?0.00:dataHarmrateV.getV23Cp95());
+                influxDBDataHarmRateV.setV24(Objects.isNull(dataHarmrateV.getV24Cp95())?0.00:dataHarmrateV.getV24Cp95());
+                influxDBDataHarmRateV.setV25(Objects.isNull(dataHarmrateV.getV25Cp95())?0.00:dataHarmrateV.getV25Cp95());
+                influxDBDataHarmRateV.setV26(Objects.isNull(dataHarmrateV.getV26Cp95())?0.00:dataHarmrateV.getV26Cp95());
+                influxDBDataHarmRateV.setV27(Objects.isNull(dataHarmrateV.getV27Cp95())?0.00:dataHarmrateV.getV27Cp95());
+                influxDBDataHarmRateV.setV28(Objects.isNull(dataHarmrateV.getV28Cp95())?0.00:dataHarmrateV.getV28Cp95());
+                influxDBDataHarmRateV.setV29(Objects.isNull(dataHarmrateV.getV29Cp95())?0.00:dataHarmrateV.getV29Cp95());
+                influxDBDataHarmRateV.setV30(Objects.isNull(dataHarmrateV.getV30Cp95())?0.00:dataHarmrateV.getV30Cp95());
+                influxDBDataHarmRateV.setV31(Objects.isNull(dataHarmrateV.getV31Cp95())?0.00:dataHarmrateV.getV31Cp95());
+                influxDBDataHarmRateV.setV32(Objects.isNull(dataHarmrateV.getV32Cp95())?0.00:dataHarmrateV.getV32Cp95());
+                influxDBDataHarmRateV.setV33(Objects.isNull(dataHarmrateV.getV33Cp95())?0.00:dataHarmrateV.getV33Cp95());
+                influxDBDataHarmRateV.setV34(Objects.isNull(dataHarmrateV.getV34Cp95())?0.00:dataHarmrateV.getV34Cp95());
+                influxDBDataHarmRateV.setV35(Objects.isNull(dataHarmrateV.getV35Cp95())?0.00:dataHarmrateV.getV35Cp95());
+                influxDBDataHarmRateV.setV36(Objects.isNull(dataHarmrateV.getV36Cp95())?0.00:dataHarmrateV.getV36Cp95());
+                influxDBDataHarmRateV.setV37(Objects.isNull(dataHarmrateV.getV37Cp95())?0.00:dataHarmrateV.getV37Cp95());
+                influxDBDataHarmRateV.setV38(Objects.isNull(dataHarmrateV.getV38Cp95())?0.00:dataHarmrateV.getV38Cp95());
+                influxDBDataHarmRateV.setV39(Objects.isNull(dataHarmrateV.getV39Cp95())?0.00:dataHarmrateV.getV39Cp95());
+                influxDBDataHarmRateV.setV40(Objects.isNull(dataHarmrateV.getV40Cp95())?0.00:dataHarmrateV.getV40Cp95());
+                influxDBDataHarmRateV.setV41(Objects.isNull(dataHarmrateV.getV41Cp95())?0.00:dataHarmrateV.getV41Cp95());
+                influxDBDataHarmRateV.setV42(Objects.isNull(dataHarmrateV.getV42Cp95())?0.00:dataHarmrateV.getV42Cp95());
+                influxDBDataHarmRateV.setV43(Objects.isNull(dataHarmrateV.getV43Cp95())?0.00:dataHarmrateV.getV43Cp95());
+                influxDBDataHarmRateV.setV44(Objects.isNull(dataHarmrateV.getV44Cp95())?0.00:dataHarmrateV.getV44Cp95());
+                influxDBDataHarmRateV.setV45(Objects.isNull(dataHarmrateV.getV45Cp95())?0.00:dataHarmrateV.getV45Cp95());
+                influxDBDataHarmRateV.setV46(Objects.isNull(dataHarmrateV.getV46Cp95())?0.00:dataHarmrateV.getV46Cp95());
+                influxDBDataHarmRateV.setV47(Objects.isNull(dataHarmrateV.getV47Cp95())?0.00:dataHarmrateV.getV47Cp95());
+                influxDBDataHarmRateV.setV48(Objects.isNull(dataHarmrateV.getV48Cp95())?0.00:dataHarmrateV.getV48Cp95());
+                influxDBDataHarmRateV.setV49(Objects.isNull(dataHarmrateV.getV49Cp95())?0.00:dataHarmrateV.getV49Cp95());
+                influxDBDataHarmRateV.setV50(Objects.isNull(dataHarmrateV.getV50Cp95())?0.00:dataHarmrateV.getV50Cp95());
+            }
+
+            influxDBDataHarmRateVList.add(influxDBDataHarmRateV);
+
+        }
+
+
+
+        return influxDBDataHarmRateVList;
+    }
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateVCvtDto.java

@@ -0,0 +1,145 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class DataHarmRateVCvtDto implements Serializable {
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String time;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String minTime;
+
+    @ApiModelProperty("监测点Id")
+    private String lineId;
+
+    @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别")
+    private String phasicType;
+
+    @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95")
+    private String valueType;
+
+    @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计")
+    private String qualityFlag;
+
+    @ApiModelProperty("数据清洗标识 0:正常 1:异常")
+    private Integer abnormalFlag;
+
+    @ApiModelProperty("0.5次间谐波电压含有率")
+    private Double v1;
+
+    @ApiModelProperty("1.5次间谐波电压含有率(2次谐波电压含有率)")
+    private Double v2;
+
+    @ApiModelProperty("2.5次间谐波电压含有率(3次谐波电压含有率)")
+    private Double v3;
+
+    @ApiModelProperty("3.5次间谐波电压含有率(4次谐波电压含有率)")
+    private Double v4;
+
+    @ApiModelProperty("4.5次间谐波电压含有率(5次谐波电压含有率)")
+    private Double v5;
+
+    @ApiModelProperty("5.5次间谐波电压含有率(6次谐波电压含有率)")
+    private Double v6;
+
+    @ApiModelProperty("6.5次间谐波电压含有率(7次谐波电压含有率)")
+    private Double v7;
+
+    @ApiModelProperty("7.5次间谐波电压含有率(8次谐波电压含有率)")
+    private Double v8;
+
+    private Double v9;
+
+    private Double v10;
+
+    private Double v11;
+
+    private Double v12;
+
+    private Double v13;
+
+    private Double v14;
+
+    private Double v15;
+
+    private Double v16;
+
+    private Double v17;
+
+    private Double v18;
+
+    private Double v19;
+
+    private Double v20;
+
+    private Double v21;
+
+    private Double v22;
+
+    private Double v23;
+
+    private Double v24;
+
+    private Double v25;
+
+    private Double v26;
+
+    private Double v27;
+
+    private Double v28;
+
+    private Double v29;
+
+    private Double v30;
+
+    private Double v31;
+
+    private Double v32;
+
+    private Double v33;
+
+    private Double v34;
+
+    private Double v35;
+
+    private Double v36;
+
+    private Double v37;
+
+    private Double v38;
+
+    private Double v39;
+
+    private Double v40;
+
+    private Double v41;
+
+    private Double v42;
+
+    private Double v43;
+
+    private Double v44;
+
+    private Double v45;
+
+    private Double v46;
+
+    private Double v47;
+
+    private Double v48;
+
+    private Double v49;
+
+    @ApiModelProperty("49.5次间谐波电压含有率(50次谐波电压含有率)")
+    private Double v50;
+
+}