Merge remote-tracking branch 'origin/master'

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

@@ -2,9 +2,12 @@ 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.DataFlickerFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataFlickerDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataFlickerDto;
+import com.njcn.dataProcess.pojo.dto.DataIDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,9 +22,15 @@ import java.util.List;
 @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataFlicker", fallbackFactory = DataFlickerFeignClientFallbackFactory.class, contextId = "dataFlicker")
 public interface DataFlickerFeignClient {
 
-
-
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataFlickerDTO> dataFlickerDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataFlickerDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/getBaseData")
+    HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/addList")
+    HttpResult<String> addList(@RequestBody List<DataFlickerDto> data);
 }

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

@@ -2,9 +2,11 @@ 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.DataFlucFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataFlucDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataFlucDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,4 +26,13 @@ public interface DataFlucFeignClient {
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataFlucDTO> dataFlucDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataFlucDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/getBaseData")
+    HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/addList")
+    HttpResult<String> addList(@RequestBody List<DataFlucDto> data);
+
 }

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

@@ -0,0 +1,23 @@
+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.DataHarmRateVFeignClientFallbackFactory;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmRateV", fallbackFactory = DataHarmRateVFeignClientFallbackFactory.class, contextId = "dataHarmRateV")
+public interface DataHarmRateVFeignClient {
+
+    @PostMapping("/getRawData")
+    HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
+}

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

@@ -5,6 +5,10 @@ import com.njcn.common.pojo.response.HttpResult;
 
 import com.njcn.dataProcess.api.fallback.DataHarmphasicIFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataFlucDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,9 +23,13 @@ import java.util.List;
 @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmphasicI", fallbackFactory = DataHarmphasicIFeignClientFallbackFactory.class, contextId = "dataHarmphasicI")
 public interface DataHarmphasicIFeignClient {
 
-
-
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataHarmphasicIDTO> dataHarmphasicIDTOList);
 
+    @PostMapping("/getBaseData")
+    HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/addList")
+    HttpResult<String> addList(@RequestBody List<DataHarmPhasicIDto> data);
+
 }

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

@@ -2,9 +2,12 @@ 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.DataIFeignClientFallbackFactory;
+import com.njcn.dataProcess.api.fallback.DataHarmphasicVFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataHarmphasicVDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +19,7 @@ import java.util.List;
  * @version 1.0.0
  * @date 2022年01月05日 15:11
  */
-@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmphasicV", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataHarmphasicV")
+@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmphasicV", fallbackFactory = DataHarmphasicVFeignClientFallbackFactory.class, contextId = "dataHarmphasicV")
 public interface DataHarmphasicVFeignClient {
 
 
@@ -24,4 +27,13 @@ public interface DataHarmphasicVFeignClient {
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataHarmphasicVDTO> dataHarmphasicVDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/getBaseData")
+    HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/addList")
+    HttpResult<String> addList(@RequestBody List<DataHarmPhasicVDto> data);
+
 }

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

@@ -2,9 +2,13 @@ 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.DataHarmpowerPFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataHarmpowerPDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto;
+import com.njcn.dataProcess.pojo.dto.DataPowerPDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,9 +23,15 @@ import java.util.List;
 @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmpowerP", fallbackFactory = DataHarmpowerPFeignClientFallbackFactory.class, contextId = "dataHarmpowerP")
 public interface DataHarmpowerPFeignClient {
 
-
-
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataHarmpowerPDTO> dataHarmpowerPDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataPowerPDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/getBaseData")
+    HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/addList")
+    HttpResult<String> addList(@RequestBody List<DataHarmPowerPDto> data);
 }

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

@@ -2,9 +2,11 @@ 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.DataHarmpowerQFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataHarmpowerQDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,4 +26,10 @@ public interface DataHarmpowerQFeignClient {
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataHarmpowerQDTO> dataHarmpowerQDTOList);
 
+    @PostMapping("/getBaseData")
+    HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/addList")
+    HttpResult<String> addList(@RequestBody List<DataHarmPowerQDto> data);
+
 }

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

@@ -2,9 +2,11 @@ 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.DataIFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataIDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataIDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,9 +21,15 @@ import java.util.List;
 @FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataI", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataI")
 public interface DataIFeignClient {
 
-
-
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataIDTO> dataIDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataIDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/getBaseData")
+    HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);
+
+    @PostMapping("/addList")
+    HttpResult<String> addList(@RequestBody List<DataIDto> dataIDtoList);
 }

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

@@ -5,6 +5,8 @@ import com.njcn.common.pojo.response.HttpResult;
 
 import com.njcn.dataProcess.api.fallback.DataInharmVFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataInharmVDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,4 +26,7 @@ public interface DataInharmVFeignClient {
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataInharmVDTO> dataInharmVDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
 }

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

@@ -2,9 +2,10 @@ 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.DataPltFeignClientFallbackFactory;
 import com.njcn.dataProcess.dto.DataPltDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataPltDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,4 +25,7 @@ public interface DataPltFeignClient {
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataPltDTO> dataPltDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataPltDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
 }

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

@@ -0,0 +1,34 @@
+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.PqDataVerifyFeignClientFallbackFactory;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.po.PqDataVerify;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author xy
+ * @version 1.0.0
+ * @date 2025年02月13日 20:11
+ */
+@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/pqDataVerify", fallbackFactory = PqDataVerifyFeignClientFallbackFactory.class, contextId = "pqDataVerify")
+public interface PqDataVerifyFeignClient {
+
+    @PostMapping("/insertData")
+    @ApiOperation("存储清洗的异常数据")
+    HttpResult<List<PqDataVerify>> insertData(@RequestBody List<PqDataVerify> list);
+
+    @PostMapping("/queryData")
+    @ApiOperation("查询清洗的异常数据")
+    HttpResult<List<PqDataVerify>> queryData(@RequestBody LineCountEvaluateParam param);
+
+
+
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/PqReasonableRangeFeignClient.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.PqReasonableRangeFeignClientFallbackFactory;
+import com.njcn.dataProcess.param.DataCleanParam;
+import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author xy
+ * @version 1.0.0
+ * @date 2025年02月13日 20:11
+ */
+@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/pqReasonableRange", fallbackFactory = PqReasonableRangeFeignClientFallbackFactory.class, contextId = "pqReasonableRange")
+public interface PqReasonableRangeFeignClient {
+
+    @PostMapping("/getData")
+    @ApiOperation("按条件获取数据合理范围")
+    HttpResult<List<PqReasonableRangeDto>> getData(@RequestBody DataCleanParam param);
+
+}

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

@@ -6,6 +6,9 @@ import com.njcn.common.pojo.response.HttpResult;
 
 import com.njcn.dataProcess.api.DataFlickerFeignClient;
 import com.njcn.dataProcess.dto.DataFlickerDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataFlickerDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +47,24 @@ public class DataFlickerFeignClientFallbackFactory implements FallbackFactory<Da
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<DataFlickerDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取算法基础数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> addList(List<DataFlickerDto> data) {
+                log.error("{}异常，降级处理，异常为：{}","存储数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -3,9 +3,11 @@ 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.DataFlucFeignClient;
 import com.njcn.dataProcess.dto.DataFlucDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataFlucDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -40,10 +42,29 @@ public class DataFlucFeignClientFallbackFactory implements FallbackFactory<DataF
 
             @Override
             public HttpResult<String> batchInsertion(List<DataFlucDTO> dataFlucDTOList) {
+
                 log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<DataFlucDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取算法原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> addList(List<DataFlucDto> data) {
+                log.error("{}异常，降级处理，异常为：{}","存储数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -0,0 +1,46 @@
+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.DataHarmRateVFeignClient;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+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 xy
+ */
+@Slf4j
+@Component
+public class DataHarmRateVFeignClientFallbackFactory implements FallbackFactory<DataHarmRateVFeignClient> {
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public DataHarmRateVFeignClient 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 DataHarmRateVFeignClient() {
+
+            @Override
+            public HttpResult<List<DataHarmDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+        };
+    }
+}

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

@@ -6,6 +6,9 @@ import com.njcn.common.pojo.response.HttpResult;
 
 import com.njcn.dataProcess.api.DataHarmphasicIFeignClient;
 import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +47,18 @@ public class DataHarmphasicIFeignClientFallbackFactory implements FallbackFactor
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取算法原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> addList(List<DataHarmPhasicIDto> data) {
+                log.error("{}异常，降级处理，异常为：{}","存储数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -0,0 +1,70 @@
+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.DataHarmphasicVFeignClient;
+import com.njcn.dataProcess.dto.DataHarmphasicVDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto;
+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 DataHarmphasicVFeignClientFallbackFactory implements FallbackFactory<DataHarmphasicVFeignClient> {
+
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public DataHarmphasicVFeignClient 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 DataHarmphasicVFeignClient() {
+
+            @Override
+            public HttpResult<String> batchInsertion(List<DataHarmphasicVDTO> dataHarmphasicVDTOList) {
+                log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<DataHarmDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取预处理数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> addList(List<DataHarmPhasicVDto> data) {
+                log.error("{}异常，降级处理，异常为：{}","日表存储数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+        };
+    }
+}

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

@@ -5,6 +5,10 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.dataProcess.api.DataHarmpowerPFeignClient;
 import com.njcn.dataProcess.dto.DataHarmpowerPDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto;
+import com.njcn.dataProcess.pojo.dto.DataPowerPDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -43,6 +47,24 @@ public class DataHarmpowerPFeignClientFallbackFactory implements FallbackFactory
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<DataPowerPDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取预处理数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> addList(List<DataHarmPowerPDto> data) {
+                log.error("{}异常，降级处理，异常为：{}","日表存储数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -5,6 +5,9 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.dataProcess.api.DataHarmpowerQFeignClient;
 import com.njcn.dataProcess.dto.DataHarmpowerQDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -43,6 +46,18 @@ public class DataHarmpowerQFeignClientFallbackFactory implements FallbackFactory
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取预处理数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> addList(List<DataHarmPowerQDto> data) {
+                log.error("{}异常，降级处理，异常为：{}","日表存储数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -5,8 +5,10 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.dataProcess.api.DataIFeignClient;
 import com.njcn.dataProcess.dto.DataIDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataIDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
-import com.njcn.system.utils.SystemEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -44,6 +46,24 @@ public class DataIFeignClientFallbackFactory implements FallbackFactory<DataIFei
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<DataIDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取算法基础数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> addList(List<DataIDto> dataIDtoList) {
+                log.error("{}异常，降级处理，异常为：{}","关系型数据库插入数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -5,8 +5,9 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.dataProcess.api.DataInharmVFeignClient;
 import com.njcn.dataProcess.dto.DataInharmVDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
-import com.njcn.system.utils.SystemEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -44,6 +45,12 @@ public class DataInharmVFeignClientFallbackFactory implements FallbackFactory<Da
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<DataHarmDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -5,8 +5,9 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.dataProcess.api.DataPltFeignClient;
 import com.njcn.dataProcess.dto.DataPltDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataPltDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
-import com.njcn.system.utils.SystemEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -44,6 +45,12 @@ public class DataPltFeignClientFallbackFactory implements FallbackFactory<DataPl
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<DataPltDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -0,0 +1,53 @@
+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.PqDataVerifyFeignClient;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.po.PqDataVerify;
+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 xy
+ * @version 1.0.0
+ * @date 2025年02月13日 20:13
+ */
+@Slf4j
+@Component
+public class PqDataVerifyFeignClientFallbackFactory implements FallbackFactory<PqDataVerifyFeignClient> {
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public PqDataVerifyFeignClient 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 PqDataVerifyFeignClient() {
+
+            @Override
+            public HttpResult<List<PqDataVerify>> insertData(List<PqDataVerify> list) {
+                log.error("{}异常，降级处理，异常为：{}","存储清洗的异常数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<PqDataVerify>> queryData(LineCountEvaluateParam param) {
+                log.error("{}异常，降级处理，异常为：{}","查询清洗的异常数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,47 @@
+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.PqReasonableRangeFeignClient;
+import com.njcn.dataProcess.param.DataCleanParam;
+import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+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 xy
+ * @version 1.0.0
+ * @date 2025年02月13日 20:13
+ */
+@Slf4j
+@Component
+public class PqReasonableRangeFeignClientFallbackFactory implements FallbackFactory<PqReasonableRangeFeignClient> {
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public PqReasonableRangeFeignClient 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 PqReasonableRangeFeignClient() {
+
+            @Override
+            public HttpResult<List<PqReasonableRangeDto>> getData(DataCleanParam param) {
+                log.error("{}异常，降级处理，异常为：{}","按条件获取数据合理范围",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.njcn.dataProcess.enums;
+
+import lombok.Getter;
+
+/**
+ * 数据清洗枚举值
+ *
+ * @author xy
+ * @version 1.0
+ * @data 2025/2/13 15:08
+ */
+@Getter
+public enum DataCleanEnum {
+
+    /**
+     * 所属系统
+     */
+    Pqs("pqs","数据中心"),
+    Govern("govern","治理"),
+
+    /**
+     * 数据来源
+     */
+    InfluxDB("InfluxDB","时序数据库"),
+    MySql("MySql","关系型数据库"),
+
+    /**
+     * 数据表名
+     */
+    DataV("DataV","电压表"),
+    DataHarmPhasicV("DataHarmPhasicV","谐波电压相角表"),
+    DataI("DataI","电路表"),
+    DataFlicker("DataFlicker","短闪表"),
+    DataPlt("DataPlt","长闪表"),
+    DataFluc("DataFluc","电压波动"),
+    DataInHarmV("DataInHarmV","间谐波电压含有率表"),
+    DataHarmRateV("DataHarmRateV","谐波电压含有率表"),
+    DataHarmPowerP("DataHarmPowerP","功率因数表"),
+    RMpEventDetail("r_mp_event_detail","暂降表"),
+
+    /**
+     * 指标名称
+     */
+    //DataFlicker
+    Pst("pst","短时闪变"),
+
+    //DataFluc
+    Fluc("fluc","电压波动"),
+
+    //DataHarmPhasicV
+    V("v","次谐波电压基波相角"),
+
+    //DataHarmRateV
+    V_Rate("v","次谐波电压含有率"),
+
+    //DataHarmPowerP
+    Pf("pf","视在功率因素"),
+
+    //DataI
+    RmsI("rms","电流有效值"),
+
+    //DataInHarmV
+    V_InHarm("v","次间谐波电压含有率"),
+
+    //DataPlt
+    Plt("plt","长时闪变"),
+
+    //DataV
+    FreqDev("freq_dev","频率偏差"),
+    Freq("freq","频率"),
+    RmsV("rms","相电压有效值"),
+    VPos("v_pos","正序电压"),
+    VNeg("v_neg","负序电压"),
+    VZero("v_zero","零序电压"),
+    VUnbalance("v_unbalance","电压不平衡度"),
+    RmsLvr("rms_lvr","线电压有效值"),
+    VuDev("vu_dev","线电压正偏差"),
+    VlDev("vl_dev","线电压负偏差"),
+    VThd("v_thd","电压总谐波畸变率"),
+    V_Data("v_1","相（线）电压基波有效值"),
+
+    //r_mp_event_detail
+    VoltageDip("Voltage_Dip","相（线）电压基波有效值"),
+    VoltageRise("Voltage_Rise","相（线）电压基波有效值");
+
+    private String code;
+
+    private String desc;
+
+    DataCleanEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.njcn.dataProcess.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class DataCleanParam implements Serializable {
+
+    @ApiModelProperty("系统类型")
+    private String systemType;
+
+    @ApiModelProperty("数据来源")
+    private String dataSource;
+
+    @ApiModelProperty("表名")
+    private String tableName;
+
+}

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

@@ -3,7 +3,9 @@ package com.njcn.dataProcess.param;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 监测点有效数值统计数据评估入参
@@ -19,4 +21,15 @@ public class LineCountEvaluateParam extends BaseParam implements Serializable {
      */
     private List<String> lineId;
 
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 异常数据时间集合
+     * Map<String,List<String>> key:监测点id value:异常时间集合
+     */
+    private Map<String,List<String>> abnormalTime;
+
 }

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

@@ -31,7 +31,7 @@ public class DataFlicker {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "fluc")
     private Double fluc=0.00;
@@ -56,7 +56,7 @@ public class DataFlicker {
 
         influxDBDataFlicker.setTime(instant);
         influxDBDataFlicker.setLineId(dataFlicker.getLineid());
-        influxDBDataFlicker.setPhaseType(dataFlicker.getPhasicType());
+        influxDBDataFlicker.setPhasicType(dataFlicker.getPhasicType());
         influxDBDataFlicker.setFluc(Objects.isNull(dataFlicker.getFluc())?0.00:dataFlicker.getFluc());
         influxDBDataFlicker.setPlt(Objects.isNull(dataFlicker.getPst())?0.00:dataFlicker.getPst());
         influxDBDataFlicker.setPst(Objects.isNull(dataFlicker.getPlt())?0.00:dataFlicker.getPlt());

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

@@ -31,7 +31,7 @@ public class DataFluc {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "fluc")
     private Double fluc=0.00;
@@ -53,7 +53,7 @@ public class DataFluc {
 
         influxDBDataFluc.setTime(instant);
         influxDBDataFluc.setLineId(dataFluc.getLineid());
-        influxDBDataFluc.setPhaseType(dataFluc.getPhasicType());
+        influxDBDataFluc.setPhasicType(dataFluc.getPhasicType());
         influxDBDataFluc.setFluc(Objects.isNull(dataFluc.getFluc())?0.00:dataFluc.getFluc());
         influxDBDataFluc.setFluccf(Objects.isNull(dataFluc.getFluccf())?0.00:dataFluc.getFluccf());
         influxDBDataFluc.setQualityFlag(dataFluc.getQualityflag()+"");

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

@@ -35,7 +35,7 @@ public class DataHarmphasicI {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -206,7 +206,7 @@ public class DataHarmphasicI {
 
             influxDBDataHarmPhasicI.setTime(instant);
             influxDBDataHarmPhasicI.setLineId(dataHarmphasicI.getLineid());
-            influxDBDataHarmPhasicI.setPhaseType(dataHarmphasicI.getPhasicType());
+            influxDBDataHarmPhasicI.setPhasicType(dataHarmphasicI.getPhasicType());
             influxDBDataHarmPhasicI.setQualityFlag(dataHarmphasicI.getQualityflag()+"");
             influxDBDataHarmPhasicI.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -36,7 +36,7 @@ public class DataHarmphasicV {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -206,7 +206,7 @@ public class DataHarmphasicV {
 
             InfluxDBDataHarmphasicV.setTime(instant);
             InfluxDBDataHarmphasicV.setLineId(dataHarmphasicV.getLineid());
-            InfluxDBDataHarmphasicV.setPhaseType(dataHarmphasicV.getPhasicType());
+            InfluxDBDataHarmphasicV.setPhasicType(dataHarmphasicV.getPhasicType());
             InfluxDBDataHarmphasicV.setQualityFlag(dataHarmphasicV.getQualityflag()+"");
             InfluxDBDataHarmphasicV.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -36,7 +36,7 @@ public class DataHarmpowerP {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -215,7 +215,7 @@ public class DataHarmpowerP {
 
             influxDBDataHarmpowerP.setTime(instant);
             influxDBDataHarmpowerP.setLineId(dataHarmpowerP.getLineid());
-            influxDBDataHarmpowerP.setPhaseType(dataHarmpowerP.getPhasicType());
+            influxDBDataHarmpowerP.setPhasicType(dataHarmpowerP.getPhasicType());
             influxDBDataHarmpowerP.setQualityFlag(dataHarmpowerP.getQualityflag()+"");
             influxDBDataHarmpowerP.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -36,7 +36,7 @@ public class DataHarmpowerQ {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -209,7 +209,7 @@ public class DataHarmpowerQ {
 
             influxDBDataHarmpowerQ.setTime(instant);
             influxDBDataHarmpowerQ.setLineId(dataHarmpowerQ.getLineid());
-            influxDBDataHarmpowerQ.setPhaseType(dataHarmpowerQ.getPhasicType());
+            influxDBDataHarmpowerQ.setPhasicType(dataHarmpowerQ.getPhasicType());
             influxDBDataHarmpowerQ.setQualityFlag(dataHarmpowerQ.getQualityflag()+"");
             influxDBDataHarmpowerQ.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -36,7 +36,7 @@ public class DataHarmpowerS {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -209,7 +209,7 @@ public class DataHarmpowerS {
 
             influxDBDataHarmpowerS.setTime(instant);
             influxDBDataHarmpowerS.setLineId(dataHarmpowerS.getLineid());
-            influxDBDataHarmpowerS.setPhaseType(dataHarmpowerS.getPhasicType());
+            influxDBDataHarmpowerS.setPhasicType(dataHarmpowerS.getPhasicType());
             influxDBDataHarmpowerS.setQualityFlag(dataHarmpowerS.getQualityflag()+"");
             influxDBDataHarmpowerS.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -35,7 +35,7 @@ public class DataHarmrateI {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -205,7 +205,7 @@ public class DataHarmrateI {
 
             influxDBDataHarmRateI.setTime(instant);
             influxDBDataHarmRateI.setLineId(dataHarmrateI.getLineid());
-            influxDBDataHarmRateI.setPhaseType(dataHarmrateI.getPhasicType());
+            influxDBDataHarmRateI.setPhasicType(dataHarmrateI.getPhasicType());
             influxDBDataHarmRateI.setQualityFlag(dataHarmrateI.getQualityflag()+"");
             influxDBDataHarmRateI.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -35,7 +35,7 @@ public class DataHarmrateV {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -205,7 +205,7 @@ public class DataHarmrateV {
 
             influxDBDataHarmRateV.setTime(instant);
             influxDBDataHarmRateV.setLineId(dataHarmrateV.getLineid());
-            influxDBDataHarmRateV.setPhaseType(dataHarmrateV.getPhasicType());
+            influxDBDataHarmRateV.setPhasicType(dataHarmrateV.getPhasicType());
             influxDBDataHarmRateV.setQualityFlag(dataHarmrateV.getQualityflag()+"");
             influxDBDataHarmRateV.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -36,7 +36,7 @@ public class DataI {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -224,7 +224,7 @@ public class DataI {
 
             influxDBDataI.setTime(instant);
             influxDBDataI.setLineId(dataI.getLineid());
-            influxDBDataI.setPhaseType(dataI.getPhasicType());
+            influxDBDataI.setPhasicType(dataI.getPhasicType());
             influxDBDataI.setQualityFlag(dataI.getQualityflag()+"");
             influxDBDataI.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -36,7 +36,7 @@ public class DataInharmI {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -207,7 +207,7 @@ public class DataInharmI {
 
             influxDBDataInHarmI.setTime(instant);
             influxDBDataInHarmI.setLineId(dataInharmI.getLineid());
-            influxDBDataInHarmI.setPhaseType(dataInharmI.getPhasicType());
+            influxDBDataInHarmI.setPhasicType(dataInharmI.getPhasicType());
             influxDBDataInHarmI.setQualityFlag(dataInharmI.getQualityflag()+"");
             influxDBDataInHarmI.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -36,7 +36,7 @@ public class DataInharmV {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -206,7 +206,7 @@ public class DataInharmV {
 
             influxDBDataInHarmV.setTime(instant);
             influxDBDataInHarmV.setLineId(dataInharmV.getLineid());
-            influxDBDataInHarmV.setPhaseType(dataInharmV.getPhasicType());
+            influxDBDataInHarmV.setPhasicType(dataInharmV.getPhasicType());
             influxDBDataInHarmV.setQualityFlag(dataInharmV.getQualityflag()+"");
             influxDBDataInHarmV.setValueType(valueType);
             if (valueType.equals("AVG")) {

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

@@ -32,7 +32,7 @@ public class DataPlt {
     private String lineId;
 
     @Column(name = "phasic_type",tag = true)
-    private String phaseType;
+    private String phasicType;
 
     @Column(name = "quality_flag",tag = true)
     private String qualityFlag;
@@ -50,7 +50,7 @@ public class DataPlt {
 
         influxDBDataPlt.setTime(instant);
         influxDBDataPlt.setLineId(dataPlt.getLineid());
-        influxDBDataPlt.setPhaseType(dataPlt.getPhasicType());
+        influxDBDataPlt.setPhasicType(dataPlt.getPhasicType());
         influxDBDataPlt.setPlt(Objects.isNull(dataPlt.getPlt())?0.00:dataPlt.getPlt());
         influxDBDataPlt.setQualityFlag(dataPlt.getQualityflag()+"");
 

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

@@ -20,6 +20,9 @@ public class CommonMinuteDto implements Serializable {
     @ApiModelProperty("监测点Id")
     private String lineId;
 
+    @ApiModelProperty("数据质量 0:正常 1:异常")
+    private String qualityFlag;
+
     private List<PhasicType> phasicTypeList;
 
     @Data

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

@@ -0,0 +1,45 @@
+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 DataFlickerDto 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("电压波动")
+    private Double fluc;
+
+    @ApiModelProperty("短时闪变")
+    private Double pst;
+
+    @ApiModelProperty("长时闪变")
+    private Double plt;
+
+}

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

@@ -0,0 +1,42 @@
+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 DataFlucDto 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("电压波动")
+    private Double fluc;
+
+    @ApiModelProperty("电压波动频度")
+    private Double fluccf;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmDto.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 DataHarmDto 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;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicIDto.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 DataHarmPhasicIDto 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("基波电流相角")
+    private Double i1;
+
+    @ApiModelProperty("2次谐波电流相角")
+    private Double i2;
+
+    @ApiModelProperty("3次谐波电流相角")
+    private Double i3;
+
+    @ApiModelProperty("4次谐波电流相角")
+    private Double i4;
+
+    @ApiModelProperty("5次谐波电流相角")
+    private Double i5;
+
+    @ApiModelProperty("6次谐波电流相角")
+    private Double i6;
+
+    @ApiModelProperty("7次谐波电流相角")
+    private Double i7;
+
+    @ApiModelProperty("8次谐波电流相角")
+    private Double i8;
+
+    private Double i9;
+
+    private Double i10;
+
+    private Double i11;
+
+    private Double i12;
+
+    private Double i13;
+
+    private Double i14;
+
+    private Double i15;
+
+    private Double i16;
+
+    private Double i17;
+
+    private Double i18;
+
+    private Double i19;
+
+    private Double i20;
+
+    private Double i21;
+
+    private Double i22;
+
+    private Double i23;
+
+    private Double i24;
+
+    private Double i25;
+
+    private Double i26;
+
+    private Double i27;
+
+    private Double i28;
+
+    private Double i29;
+
+    private Double i30;
+
+    private Double i31;
+
+    private Double i32;
+
+    private Double i33;
+
+    private Double i34;
+
+    private Double i35;
+
+    private Double i36;
+
+    private Double i37;
+
+    private Double i38;
+
+    private Double i39;
+
+    private Double i40;
+
+    private Double i41;
+
+    private Double i42;
+
+    private Double i43;
+
+    private Double i44;
+
+    private Double i45;
+
+    private Double i46;
+
+    private Double i47;
+
+    private Double i48;
+
+    private Double i49;
+
+    @ApiModelProperty("50次谐波电流相角")
+    private Double i50;
+
+}

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

@@ -0,0 +1,146 @@
+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 DataHarmPhasicVDto 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("基波电压相角")
+    private Double v1;
+
+    @ApiModelProperty("2次谐波电压相角")
+    private Double v2;
+
+    @ApiModelProperty("3次谐波电压相角")
+    private Double v3;
+
+    @ApiModelProperty("4次谐波电压相角")
+    private Double v4;
+
+    @ApiModelProperty("5次谐波电压相角")
+    private Double v5;
+
+    @ApiModelProperty("6次谐波电压相角")
+    private Double v6;
+
+    @ApiModelProperty("7次谐波电压相角")
+    private Double v7;
+
+    @ApiModelProperty("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("50次谐波电压相角")
+    private Double v50;
+
+
+}

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

@@ -0,0 +1,153 @@
+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 DataHarmPowerPDto 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("视在功率因素")
+    private Double pf;
+
+    @ApiModelProperty("位移功率因数")
+    private Double df;
+
+    @ApiModelProperty("总有功功率")
+    private Double p;
+
+    @ApiModelProperty("基波有功功率")
+    private Double p1;
+
+    @ApiModelProperty("2次谐波有功功率")
+    private Double p2;
+
+    @ApiModelProperty("3次谐波有功功率")
+    private Double p3;
+
+    @ApiModelProperty("4次谐波有功功率")
+    private Double p4;
+
+    @ApiModelProperty("5次谐波有功功率")
+    private Double p5;
+
+    @ApiModelProperty("6次谐波有功功率")
+    private Double p6;
+
+    @ApiModelProperty("7次谐波有功功率")
+    private Double p7;
+
+    @ApiModelProperty("8次谐波有功功率")
+    private Double p8;
+
+    private Double p9;
+
+    private Double p10;
+
+    private Double p11;
+
+    private Double p12;
+
+    private Double p13;
+
+    private Double p14;
+
+    private Double p15;
+
+    private Double p16;
+
+    private Double p17;
+
+    private Double p18;
+
+    private Double p19;
+
+    private Double p20;
+
+    private Double p21;
+
+    private Double p22;
+
+    private Double p23;
+
+    private Double p24;
+
+    private Double p25;
+
+    private Double p26;
+
+    private Double p27;
+
+    private Double p28;
+
+    private Double p29;
+
+    private Double p30;
+
+    private Double p31;
+
+    private Double p32;
+
+    private Double p33;
+
+    private Double p34;
+
+    private Double p35;
+
+    private Double p36;
+
+    private Double p37;
+
+    private Double p38;
+
+    private Double p39;
+
+    private Double p40;
+
+    private Double p41;
+
+    private Double p42;
+
+    private Double p43;
+
+    private Double p44;
+
+    private Double p45;
+
+    private Double p46;
+
+    private Double p47;
+
+    private Double p48;
+
+    private Double p49;
+
+    @ApiModelProperty("50次谐波有功功率")
+    private Double p50;
+}

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

@@ -0,0 +1,147 @@
+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 DataHarmPowerQDto 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("总无功功率")
+    private Double q;
+
+    @ApiModelProperty("基波无功功率")
+    private Double q1;
+
+    @ApiModelProperty("2次谐波无功功率")
+    private Double q2;
+
+    @ApiModelProperty("3次谐波无功功率")
+    private Double q3;
+
+    @ApiModelProperty("4次谐波无功功率")
+    private Double q4;
+
+    @ApiModelProperty("5次谐波无功功率")
+    private Double q5;
+
+    @ApiModelProperty("6次谐波无功功率")
+    private Double q6;
+
+    @ApiModelProperty("7次谐波无功功率")
+    private Double q7;
+
+    @ApiModelProperty("8次谐波无功功率")
+    private Double q8;
+
+    private Double q9;
+
+    private Double q10;
+
+    private Double q11;
+
+    private Double q12;
+
+    private Double q13;
+
+    private Double q14;
+
+    private Double q15;
+
+    private Double q16;
+
+    private Double q17;
+
+    private Double q18;
+
+    private Double q19;
+
+    private Double q20;
+
+    private Double q21;
+
+    private Double q22;
+
+    private Double q23;
+
+    private Double q24;
+
+    private Double q25;
+
+    private Double q26;
+
+    private Double q27;
+
+    private Double q28;
+
+    private Double q29;
+
+    private Double q30;
+
+    private Double q31;
+
+    private Double q32;
+
+    private Double q33;
+
+    private Double q34;
+
+    private Double q35;
+
+    private Double q36;
+
+    private Double q37;
+
+    private Double q38;
+
+    private Double q39;
+
+    private Double q40;
+
+    private Double q41;
+
+    private Double q42;
+
+    private Double q43;
+
+    private Double q44;
+
+    private Double q45;
+
+    private Double q46;
+
+    private Double q47;
+
+    private Double q48;
+
+    private Double q49;
+
+    @ApiModelProperty("50次谐波无功功率")
+    private Double q50;
+}

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

@@ -0,0 +1,147 @@
+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 DataHarmPowerSDto 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("总视在功率")
+    private Double s;
+
+    @ApiModelProperty("基波视在功率")
+    private Double s1;
+
+    @ApiModelProperty("2次谐波视在功率")
+    private Double s2;
+
+    @ApiModelProperty("3次谐波视在功率")
+    private Double s3;
+
+    @ApiModelProperty("4次谐波视在功率")
+    private Double s4;
+
+    @ApiModelProperty("5次谐波视在功率")
+    private Double s5;
+
+    @ApiModelProperty("6次谐波视在功率")
+    private Double s6;
+
+    @ApiModelProperty("7次谐波视在功率")
+    private Double s7;
+
+    @ApiModelProperty("8次谐波视在功率")
+    private Double s8;
+
+    private Double s9;
+
+    private Double s10;
+
+    private Double s11;
+
+    private Double s12;
+
+    private Double s13;
+
+    private Double s14;
+
+    private Double s15;
+
+    private Double s16;
+
+    private Double s17;
+
+    private Double s18;
+
+    private Double s19;
+
+    private Double s20;
+
+    private Double s21;
+
+    private Double s22;
+
+    private Double s23;
+
+    private Double s24;
+
+    private Double s25;
+
+    private Double s26;
+
+    private Double s27;
+
+    private Double s28;
+
+    private Double s29;
+
+    private Double s30;
+
+    private Double s31;
+
+    private Double s32;
+
+    private Double s33;
+
+    private Double s34;
+
+    private Double s35;
+
+    private Double s36;
+
+    private Double s37;
+
+    private Double s38;
+
+    private Double s39;
+
+    private Double s40;
+
+    private Double s41;
+
+    private Double s42;
+
+    private Double s43;
+
+    private Double s44;
+
+    private Double s45;
+
+    private Double s46;
+
+    private Double s47;
+
+    private Double s48;
+
+    private Double s49;
+
+    @ApiModelProperty("50次谐波视在功率")
+    private Double s50;
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateIDto.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 DataHarmRateIDto 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("基波电流含有率")
+    private Double i1;
+
+    @ApiModelProperty("2次谐波电流含有率")
+    private Double i2;
+
+    @ApiModelProperty("3次谐波电流含有率")
+    private Double i3;
+
+    @ApiModelProperty("4次谐波电流含有率")
+    private Double i4;
+
+    @ApiModelProperty("5次谐波电流含有率")
+    private Double i5;
+
+    @ApiModelProperty("6次谐波电流含有率")
+    private Double i6;
+
+    @ApiModelProperty("7次谐波电流含有率")
+    private Double i7;
+
+    @ApiModelProperty("8次谐波电流含有率")
+    private Double i8;
+
+    private Double i9;
+
+    private Double i10;
+
+    private Double i11;
+
+    private Double i12;
+
+    private Double i13;
+
+    private Double i14;
+
+    private Double i15;
+
+    private Double i16;
+
+    private Double i17;
+
+    private Double i18;
+
+    private Double i19;
+
+    private Double i20;
+
+    private Double i21;
+
+    private Double i22;
+
+    private Double i23;
+
+    private Double i24;
+
+    private Double i25;
+
+    private Double i26;
+
+    private Double i27;
+
+    private Double i28;
+
+    private Double i29;
+
+    private Double i30;
+
+    private Double i31;
+
+    private Double i32;
+
+    private Double i33;
+
+    private Double i34;
+
+    private Double i35;
+
+    private Double i36;
+
+    private Double i37;
+
+    private Double i38;
+
+    private Double i39;
+
+    private Double i40;
+
+    private Double i41;
+
+    private Double i42;
+
+    private Double i43;
+
+    private Double i44;
+
+    private Double i45;
+
+    private Double i46;
+
+    private Double i47;
+
+    private Double i48;
+
+    private Double i49;
+
+    @ApiModelProperty("50次谐波电流含有率")
+    private Double i50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateVDto.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 DataHarmRateVDto 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("基波电压含有率")
+    private Double v1;
+
+    @ApiModelProperty("2次谐波电压含有率")
+    private Double v2;
+
+    @ApiModelProperty("3次谐波电压含有率")
+    private Double v3;
+
+    @ApiModelProperty("4次谐波电压含有率")
+    private Double v4;
+
+    @ApiModelProperty("5次谐波电压含有率")
+    private Double v5;
+
+    @ApiModelProperty("6次谐波电压含有率")
+    private Double v6;
+
+    @ApiModelProperty("7次谐波电压含有率")
+    private Double v7;
+
+    @ApiModelProperty("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("50次谐波电压含有率")
+    private Double v50;
+
+}

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

@@ -0,0 +1,163 @@
+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 DataIDto 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("负序电流")
+    private Double iNeg;
+
+    @ApiModelProperty("正序电流")
+    private Double iPos;
+
+    @ApiModelProperty("电流总谐波畸变率")
+    private Double iThd;
+
+    @ApiModelProperty("三相电流不平衡度")
+    private Double iUnbalance;
+
+    @ApiModelProperty("零序电流")
+    private Double iZero;
+
+    @ApiModelProperty("电流有效值")
+    private Double rms;
+
+    @ApiModelProperty("基波电流幅值")
+    private Double i1;
+
+    @ApiModelProperty("2次谐波电流幅值")
+    private Double i2;
+
+    @ApiModelProperty("3次谐波电流幅值")
+    private Double i3;
+
+    @ApiModelProperty("4次谐波电流幅值")
+    private Double i4;
+
+    @ApiModelProperty("5次谐波电流幅值")
+    private Double i5;
+
+    @ApiModelProperty("6次谐波电流幅值")
+    private Double i6;
+
+    @ApiModelProperty("7次谐波电流幅值")
+    private Double i7;
+
+    @ApiModelProperty("8次谐波电流幅值")
+    private Double i8;
+
+    private Double i9;
+
+    private Double i10;
+
+    private Double i11;
+
+    private Double i12;
+
+    private Double i13;
+
+    private Double i14;
+
+    private Double i15;
+
+    private Double i16;
+
+    private Double i17;
+
+    private Double i18;
+
+    private Double i19;
+
+    private Double i20;
+
+    private Double i21;
+
+    private Double i22;
+
+    private Double i23;
+
+    private Double i24;
+
+    private Double i25;
+
+    private Double i26;
+
+    private Double i27;
+
+    private Double i28;
+
+    private Double i29;
+
+    private Double i30;
+
+    private Double i31;
+
+    private Double i32;
+
+    private Double i33;
+
+    private Double i34;
+
+    private Double i35;
+
+    private Double i36;
+
+    private Double i37;
+
+    private Double i38;
+
+    private Double i39;
+
+    private Double i40;
+
+    private Double i41;
+
+    private Double i42;
+
+    private Double i43;
+
+    private Double i44;
+
+    private Double i45;
+
+    private Double i46;
+
+    private Double i47;
+
+    private Double i48;
+
+    private Double i49;
+
+    @ApiModelProperty("50次谐波电流幅值")
+    private Double i50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmIDto.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 DataInHarmIDto 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 i1;
+
+    @ApiModelProperty("1.5次间谐波电流幅值")
+    private Double i2;
+
+    @ApiModelProperty("2.5次间谐波电流幅值")
+    private Double i3;
+
+    @ApiModelProperty("3.5次间谐波电流幅值")
+    private Double i4;
+
+    @ApiModelProperty("4.5次间谐波电流幅值")
+    private Double i5;
+
+    @ApiModelProperty("5.5次间谐波电流幅值")
+    private Double i6;
+
+    @ApiModelProperty("6.5次间谐波电流幅值")
+    private Double i7;
+
+    @ApiModelProperty("7.5次间谐波电流幅值")
+    private Double i8;
+
+    private Double i9;
+
+    private Double i10;
+
+    private Double i11;
+
+    private Double i12;
+
+    private Double i13;
+
+    private Double i14;
+
+    private Double i15;
+
+    private Double i16;
+
+    private Double i17;
+
+    private Double i18;
+
+    private Double i19;
+
+    private Double i20;
+
+    private Double i21;
+
+    private Double i22;
+
+    private Double i23;
+
+    private Double i24;
+
+    private Double i25;
+
+    private Double i26;
+
+    private Double i27;
+
+    private Double i28;
+
+    private Double i29;
+
+    private Double i30;
+
+    private Double i31;
+
+    private Double i32;
+
+    private Double i33;
+
+    private Double i34;
+
+    private Double i35;
+
+    private Double i36;
+
+    private Double i37;
+
+    private Double i38;
+
+    private Double i39;
+
+    private Double i40;
+
+    private Double i41;
+
+    private Double i42;
+
+    private Double i43;
+
+    private Double i44;
+
+    private Double i45;
+
+    private Double i46;
+
+    private Double i47;
+
+    private Double i48;
+
+    private Double i49;
+
+    @ApiModelProperty("49.5次间谐波电流幅值")
+    private Double i50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmVDto.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 DataInHarmVDto 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次间谐波电压幅值")
+    private Double v2;
+
+    @ApiModelProperty("2.5次间谐波电压幅值")
+    private Double v3;
+
+    @ApiModelProperty("3.5次间谐波电压幅值")
+    private Double v4;
+
+    @ApiModelProperty("4.5次间谐波电压幅值")
+    private Double v5;
+
+    @ApiModelProperty("5.5次间谐波电压幅值")
+    private Double v6;
+
+    @ApiModelProperty("6.5次间谐波电压幅值")
+    private Double v7;
+
+    @ApiModelProperty("7.5次间谐波电压幅值")
+    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次间谐波电压幅值")
+    private Double v50;
+
+}

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

@@ -0,0 +1,39 @@
+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 DataPltDto 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("长时闪变值")
+    private Double plt;
+
+}

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

@@ -0,0 +1,154 @@
+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 DataPowerPDto 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("位移功率因数")
+    private Double df;
+
+    @ApiModelProperty("视在功率因素")
+    private Double pf;
+
+    @ApiModelProperty("总功功率")
+    private Double p;
+
+    @ApiModelProperty("基波有功功率")
+    private Double p1;
+
+    @ApiModelProperty("2次谐波有功功率")
+    private Double p2;
+
+    @ApiModelProperty("3次谐波有功功率")
+    private Double p3;
+
+    @ApiModelProperty("4次谐波有功功率")
+    private Double p4;
+
+    @ApiModelProperty("5次谐波有功功率")
+    private Double p5;
+
+    @ApiModelProperty("6次谐波有功功率")
+    private Double p6;
+
+    @ApiModelProperty("7次谐波有功功率")
+    private Double p7;
+
+    @ApiModelProperty("8次谐波有功功率")
+    private Double p8;
+
+    private Double p9;
+
+    private Double p10;
+
+    private Double p11;
+
+    private Double p12;
+
+    private Double p13;
+
+    private Double p14;
+
+    private Double p15;
+
+    private Double p16;
+
+    private Double p17;
+
+    private Double p18;
+
+    private Double p19;
+
+    private Double p20;
+
+    private Double p21;
+
+    private Double p22;
+
+    private Double p23;
+
+    private Double p24;
+
+    private Double p25;
+
+    private Double p26;
+
+    private Double p27;
+
+    private Double p28;
+
+    private Double p29;
+
+    private Double p30;
+
+    private Double p31;
+
+    private Double p32;
+
+    private Double p33;
+
+    private Double p34;
+
+    private Double p35;
+
+    private Double p36;
+
+    private Double p37;
+
+    private Double p38;
+
+    private Double p39;
+
+    private Double p40;
+
+    private Double p41;
+
+    private Double p42;
+
+    private Double p43;
+
+    private Double p44;
+
+    private Double p45;
+
+    private Double p46;
+
+    private Double p47;
+
+    private Double p48;
+
+    private Double p49;
+
+    @ApiModelProperty("50次谐波有功功率")
+    private Double p50;
+
+}

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

@@ -0,0 +1,100 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class PqReasonableRangeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 指标code
+     */
+    private String indexCode;
+
+    /**
+     * 指标名称
+     */
+    private String indexName;
+
+    /**
+     * 指标开始
+     */
+    private Integer harmStart;
+
+    /**
+     * 指标结束
+     */
+    private Integer harmEnd;
+
+    /**
+     * 指标所属项别
+     */
+    private String phaseType;
+
+    /**
+     * 指标所属influxdb表的实体类
+     */
+    private String influxdbTableName;
+
+    /**
+     * 指标所属类的属性
+     */
+    private String influxdbColumnName;
+
+    /**
+     * 指标下限
+     */
+    private Double minValue;
+
+    /**
+     * 指标上限
+     */
+    private Double maxValue;
+
+    /**
+     * 电压等级是否参与计算(0:不参与1:参与)
+     */
+    private Integer isVoltage;
+
+    /**
+     * Ct变比是否参与计算
+     */
+    private Integer ctAttendFlag;
+
+    /**
+     * 指标数据源（influxdb，oralce，mysql）
+     */
+    private String dataSource;
+
+    /**
+     * 无具体范围，判断的条件描述
+     */
+    private String otherAlgorithm;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 所属系统（pqs，govern）目前就这个两个系统
+     */
+    private String belongingSystem;
+
+    /**
+     * 状态(0:删除 1:正常)
+     */
+    private Integer state;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerify.java

@@ -0,0 +1,96 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xy
+ * @since 2025-02-17
+ */
+@Getter
+@Setter
+@TableName("pq_data_verify")
+public class PqDataVerify implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点id
+     */
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    /**
+     * 异常数据时间
+     */
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDateTime time;
+
+    /**
+     * 数据类型(最大值：max、最小值：min、平均值：avg、95值：cp95)
+     */
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    /**
+     * 相别："A" "B" "C" "ABC" "T"
+     */
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    /**
+     * 指标code
+     */
+    @MppMultiId
+    @TableField(value = "index_code")
+    private String indexCode;
+
+    /**
+     * 指标名称
+     */
+    @MppMultiId
+    @TableField(value = "index_name")
+    private String indexName;
+
+    /**
+     * 指标表名
+     */
+    @MppMultiId
+    @TableField(value = "index_table")
+    private String indexTable;
+
+    /**
+     * 异常值
+     */
+    @TableField(value = "abnormal_value")
+    private Double abnormalValue;
+
+    /**
+     * 指标上限
+     */
+    @TableField(value = "min_value")
+    private Double minValue;
+
+    /**
+     * 指标下限
+     */
+    @TableField(value = "max_value")
+    private Double maxValue;
+
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqReasonableRange.java

@@ -0,0 +1,110 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xy
+ * @since 2025-02-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pq_reasonable_range")
+public class PqReasonableRange extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 指标code
+     */
+    private String indexCode;
+
+    /**
+     * 指标名称
+     */
+    private String indexName;
+
+    /**
+     * 指标开始
+     */
+    private Integer harmStart;
+
+    /**
+     * 指标结束
+     */
+    private Integer harmEnd;
+
+    /**
+     * 指标所属项别
+     */
+    private String phaseType;
+
+    /**
+     * 指标所属influxdb表的实体类
+     */
+    private String influxdbTableName;
+
+    /**
+     * 指标所属类的属性
+     */
+    private String influxdbColumnName;
+
+    /**
+     * 指标下限
+     */
+    private Double minValue;
+
+    /**
+     * 指标上限
+     */
+    private Double maxValue;
+
+    /**
+     * 电压等级是否参与计算(0:不参与1:参与)
+     */
+    private Integer isVoltage;
+
+    /**
+     * Ct变比是否参与计算
+     */
+    private Integer ctAttendFlag;
+
+    /**
+     * 指标数据源（influxdb，oralce，mysql）
+     */
+    private String dataSource;
+
+    /**
+     * 无具体范围，判断的条件描述
+     */
+    private String otherAlgorithm;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 所属系统（pqs，govern）目前就这个两个系统
+     */
+    private String belongingSystem;
+
+    /**
+     * 状态(0:删除 1:正常)
+     */
+    private Integer state;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlickerD.java

@@ -0,0 +1,50 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "r_stat_data_flicker_d")
+public class RStatDataFlickerD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "fluc",updateStrategy = FieldStrategy.IGNORED)
+    private Double fluc;
+
+    @TableField(value = "plt",updateStrategy = FieldStrategy.IGNORED)
+    private Double plt;
+
+    @TableField(value = "pst",updateStrategy = FieldStrategy.IGNORED)
+    private Double pst;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlucD.java

@@ -0,0 +1,47 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "r_stat_data_fluc_d")
+public class RStatDataFlucD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "fluc",updateStrategy = FieldStrategy.IGNORED)
+    private Double fluc;
+
+    @TableField(value = "fluccf",updateStrategy = FieldStrategy.IGNORED)
+    private Double fluccf;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicID.java

@@ -0,0 +1,191 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_HARMPHASIC_I_D")
+public class RStatDataHarmPhasicID implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double i1;
+
+    @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double i2;
+
+    @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double i3;
+
+    @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double i4;
+
+    @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double i5;
+
+    @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double i6;
+
+    @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double i7;
+
+    @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double i8;
+
+    @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double i9;
+
+    @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double i10;
+
+    @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double i11;
+
+    @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double i12;
+
+    @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double i13;
+
+    @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double i14;
+
+    @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double i15;
+
+    @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double i16;
+
+    @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double i17;
+
+    @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double i18;
+
+    @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double i19;
+
+    @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double i20;
+
+    @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double i21;
+
+    @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double i22;
+
+    @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double i23;
+
+    @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double i24;
+
+    @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double i25;
+
+    @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double i26;
+
+    @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double i27;
+
+    @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double i28;
+
+    @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double i29;
+
+    @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double i30;
+
+    @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double i31;
+
+    @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double i32;
+
+    @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double i33;
+
+    @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double i34;
+
+    @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double i35;
+
+    @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double i36;
+
+    @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double i37;
+
+    @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double i38;
+
+    @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double i39;
+
+    @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double i40;
+
+    @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double i41;
+
+    @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double i42;
+
+    @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double i43;
+
+    @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double i44;
+
+    @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double i45;
+
+    @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double i46;
+
+    @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double i47;
+
+    @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double i48;
+
+    @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double i49;
+
+    @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double i50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicVD.java

@@ -0,0 +1,191 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_HARMPHASIC_V_D")
+public class RStatDataHarmPhasicVD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "v_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double v1;
+
+    @TableField(value = "v_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double v2;
+
+    @TableField(value = "v_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double v3;
+
+    @TableField(value = "v_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double v4;
+
+    @TableField(value = "v_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double v5;
+
+    @TableField(value = "v_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double v6;
+
+    @TableField(value = "v_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double v7;
+
+    @TableField(value = "v_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double v8;
+
+    @TableField(value = "v_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double v9;
+
+    @TableField(value = "v_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double v10;
+
+    @TableField(value = "v_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double v11;
+
+    @TableField(value = "v_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double v12;
+
+    @TableField(value = "v_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double v13;
+
+    @TableField(value = "v_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double v14;
+
+    @TableField(value = "v_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double v15;
+
+    @TableField(value = "v_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double v16;
+
+    @TableField(value = "v_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double v17;
+
+    @TableField(value = "v_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double v18;
+
+    @TableField(value = "v_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double v19;
+
+    @TableField(value = "v_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double v20;
+
+    @TableField(value = "v_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double v21;
+
+    @TableField(value = "v_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double v22;
+
+    @TableField(value = "v_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double v23;
+
+    @TableField(value = "v_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double v24;
+
+    @TableField(value = "v_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double v25;
+
+    @TableField(value = "v_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double v26;
+
+    @TableField(value = "v_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double v27;
+
+    @TableField(value = "v_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double v28;
+
+    @TableField(value = "v_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double v29;
+
+    @TableField(value = "v_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double v30;
+
+    @TableField(value = "v_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double v31;
+
+    @TableField(value = "v_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double v32;
+
+    @TableField(value = "v_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double v33;
+
+    @TableField(value = "v_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double v34;
+
+    @TableField(value = "v_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double v35;
+
+    @TableField(value = "v_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double v36;
+
+    @TableField(value = "v_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double v37;
+
+    @TableField(value = "v_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double v38;
+
+    @TableField(value = "v_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double v39;
+
+    @TableField(value = "v_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double v40;
+
+    @TableField(value = "v_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double v41;
+
+    @TableField(value = "v_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double v42;
+
+    @TableField(value = "v_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double v43;
+
+    @TableField(value = "v_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double v44;
+
+    @TableField(value = "v_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double v45;
+
+    @TableField(value = "v_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double v46;
+
+    @TableField(value = "v_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double v47;
+
+    @TableField(value = "v_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double v48;
+
+    @TableField(value = "v_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double v49;
+
+    @TableField(value = "v_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double v50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerPD.java

@@ -0,0 +1,200 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_HARMPOWER_P_D")
+public class RStatDataHarmPowerPD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "p",updateStrategy = FieldStrategy.IGNORED)
+    private Double p;
+
+    @TableField(value = "pf",updateStrategy = FieldStrategy.IGNORED)
+    private Double pf;
+
+    @TableField(value = "df",updateStrategy = FieldStrategy.IGNORED)
+    private Double df;
+
+    @TableField(value = "p_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double p1;
+
+    @TableField(value = "p_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double p2;
+
+    @TableField(value = "p_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double p3;
+
+    @TableField(value = "p_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double p4;
+
+    @TableField(value = "p_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double p5;
+
+    @TableField(value = "p_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double p6;
+
+    @TableField(value = "p_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double p7;
+
+    @TableField(value = "p_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double p8;
+
+    @TableField(value = "p_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double p9;
+
+    @TableField(value = "p_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double p10;
+
+    @TableField(value = "p_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double p11;
+
+    @TableField(value = "p_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double p12;
+
+    @TableField(value = "p_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double p13;
+
+    @TableField(value = "p_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double p14;
+
+    @TableField(value = "p_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double p15;
+
+    @TableField(value = "p_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double p16;
+
+    @TableField(value = "p_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double p17;
+
+    @TableField(value = "p_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double p18;
+
+    @TableField(value = "p_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double p19;
+
+    @TableField(value = "p_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double p20;
+
+    @TableField(value = "p_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double p21;
+
+    @TableField(value = "p_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double p22;
+
+    @TableField(value = "p_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double p23;
+
+    @TableField(value = "p_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double p24;
+
+    @TableField(value = "p_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double p25;
+
+    @TableField(value = "p_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double p26;
+
+    @TableField(value = "p_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double p27;
+
+    @TableField(value = "p_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double p28;
+
+    @TableField(value = "p_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double p29;
+
+    @TableField(value = "p_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double p30;
+
+    @TableField(value = "p_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double p31;
+
+    @TableField(value = "p_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double p32;
+
+    @TableField(value = "p_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double p33;
+
+    @TableField(value = "p_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double p34;
+
+    @TableField(value = "p_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double p35;
+
+    @TableField(value = "p_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double p36;
+
+    @TableField(value = "p_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double p37;
+
+    @TableField(value = "p_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double p38;
+
+    @TableField(value = "p_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double p39;
+
+    @TableField(value = "p_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double p40;
+
+    @TableField(value = "p_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double p41;
+
+    @TableField(value = "p_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double p42;
+
+    @TableField(value = "p_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double p43;
+
+    @TableField(value = "p_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double p44;
+
+    @TableField(value = "p_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double p45;
+
+    @TableField(value = "p_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double p46;
+
+    @TableField(value = "p_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double p47;
+
+    @TableField(value = "p_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double p48;
+
+    @TableField(value = "p_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double p49;
+
+    @TableField(value = "p_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double p50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerQD.java

@@ -0,0 +1,194 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_HARMPOWER_Q_D")
+public class RStatDataHarmPowerQD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "q",updateStrategy = FieldStrategy.IGNORED)
+    private Double q;
+
+    @TableField(value = "q_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double q1;
+
+    @TableField(value = "q_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double q2;
+
+    @TableField(value = "q_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double q3;
+
+    @TableField(value = "q_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double q4;
+
+    @TableField(value = "q_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double q5;
+
+    @TableField(value = "q_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double q6;
+
+    @TableField(value = "q_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double q7;
+
+    @TableField(value = "q_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double q8;
+
+    @TableField(value = "q_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double q9;
+
+    @TableField(value = "q_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double q10;
+
+    @TableField(value = "q_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double q11;
+
+    @TableField(value = "q_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double q12;
+
+    @TableField(value = "q_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double q13;
+
+    @TableField(value = "q_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double q14;
+
+    @TableField(value = "q_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double q15;
+
+    @TableField(value = "q_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double q16;
+
+    @TableField(value = "q_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double q17;
+
+    @TableField(value = "q_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double q18;
+
+    @TableField(value = "q_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double q19;
+
+    @TableField(value = "q_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double q20;
+
+    @TableField(value = "q_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double q21;
+
+    @TableField(value = "q_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double q22;
+
+    @TableField(value = "q_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double q23;
+
+    @TableField(value = "q_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double q24;
+
+    @TableField(value = "q_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double q25;
+
+    @TableField(value = "q_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double q26;
+
+    @TableField(value = "q_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double q27;
+
+    @TableField(value = "q_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double q28;
+
+    @TableField(value = "q_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double q29;
+
+    @TableField(value = "q_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double q30;
+
+    @TableField(value = "q_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double q31;
+
+    @TableField(value = "q_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double q32;
+
+    @TableField(value = "q_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double q33;
+
+    @TableField(value = "q_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double q34;
+
+    @TableField(value = "q_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double q35;
+
+    @TableField(value = "q_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double q36;
+
+    @TableField(value = "q_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double q37;
+
+    @TableField(value = "q_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double q38;
+
+    @TableField(value = "q_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double q39;
+
+    @TableField(value = "q_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double q40;
+
+    @TableField(value = "q_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double q41;
+
+    @TableField(value = "q_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double q42;
+
+    @TableField(value = "q_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double q43;
+
+    @TableField(value = "q_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double q44;
+
+    @TableField(value = "q_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double q45;
+
+    @TableField(value = "q_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double q46;
+
+    @TableField(value = "q_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double q47;
+
+    @TableField(value = "q_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double q48;
+
+    @TableField(value = "q_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double q49;
+
+    @TableField(value = "q_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double q50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerSD.java

@@ -0,0 +1,191 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_HARMPOWER_S_D")
+public class RStatDataHarmPowerSD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "s_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double s1;
+
+    @TableField(value = "s_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double s2;
+
+    @TableField(value = "s_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double s3;
+
+    @TableField(value = "s_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double s4;
+
+    @TableField(value = "s_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double s5;
+
+    @TableField(value = "s_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double s6;
+
+    @TableField(value = "s_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double s7;
+
+    @TableField(value = "s_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double s8;
+
+    @TableField(value = "s_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double s9;
+
+    @TableField(value = "s_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double s10;
+
+    @TableField(value = "s_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double s11;
+
+    @TableField(value = "s_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double s12;
+
+    @TableField(value = "s_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double s13;
+
+    @TableField(value = "s_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double s14;
+
+    @TableField(value = "s_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double s15;
+
+    @TableField(value = "s_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double s16;
+
+    @TableField(value = "s_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double s17;
+
+    @TableField(value = "s_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double s18;
+
+    @TableField(value = "s_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double s19;
+
+    @TableField(value = "s_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double s20;
+
+    @TableField(value = "s_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double s21;
+
+    @TableField(value = "s_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double s22;
+
+    @TableField(value = "s_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double s23;
+
+    @TableField(value = "s_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double s24;
+
+    @TableField(value = "s_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double s25;
+
+    @TableField(value = "s_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double s26;
+
+    @TableField(value = "s_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double s27;
+
+    @TableField(value = "s_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double s28;
+
+    @TableField(value = "s_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double s29;
+
+    @TableField(value = "s_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double s30;
+
+    @TableField(value = "s_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double s31;
+
+    @TableField(value = "s_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double s32;
+
+    @TableField(value = "s_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double s33;
+
+    @TableField(value = "s_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double s34;
+
+    @TableField(value = "s_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double s35;
+
+    @TableField(value = "s_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double s36;
+
+    @TableField(value = "s_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double s37;
+
+    @TableField(value = "s_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double s38;
+
+    @TableField(value = "s_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double s39;
+
+    @TableField(value = "s_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double s40;
+
+    @TableField(value = "s_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double s41;
+
+    @TableField(value = "s_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double s42;
+
+    @TableField(value = "s_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double s43;
+
+    @TableField(value = "s_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double s44;
+
+    @TableField(value = "s_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double s45;
+
+    @TableField(value = "s_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double s46;
+
+    @TableField(value = "s_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double s47;
+
+    @TableField(value = "s_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double s48;
+
+    @TableField(value = "s_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double s49;
+
+    @TableField(value = "s_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double s50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateID.java

@@ -0,0 +1,191 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_HARMRATE_I_D")
+public class RStatDataHarmRateID implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double i1;
+
+    @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double i2;
+
+    @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double i3;
+
+    @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double i4;
+
+    @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double i5;
+
+    @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double i6;
+
+    @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double i7;
+
+    @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double i8;
+
+    @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double i9;
+
+    @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double i10;
+
+    @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double i11;
+
+    @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double i12;
+
+    @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double i13;
+
+    @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double i14;
+
+    @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double i15;
+
+    @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double i16;
+
+    @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double i17;
+
+    @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double i18;
+
+    @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double i19;
+
+    @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double i20;
+
+    @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double i21;
+
+    @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double i22;
+
+    @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double i23;
+
+    @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double i24;
+
+    @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double i25;
+
+    @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double i26;
+
+    @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double i27;
+
+    @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double i28;
+
+    @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double i29;
+
+    @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double i30;
+
+    @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double i31;
+
+    @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double i32;
+
+    @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double i33;
+
+    @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double i34;
+
+    @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double i35;
+
+    @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double i36;
+
+    @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double i37;
+
+    @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double i38;
+
+    @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double i39;
+
+    @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double i40;
+
+    @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double i41;
+
+    @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double i42;
+
+    @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double i43;
+
+    @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double i44;
+
+    @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double i45;
+
+    @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double i46;
+
+    @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double i47;
+
+    @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double i48;
+
+    @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double i49;
+
+    @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double i50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateVD.java

@@ -0,0 +1,191 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_HARMRATE_V_D")
+public class RStatDataHarmRateVD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "v_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double v1;
+
+    @TableField(value = "v_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double v2;
+
+    @TableField(value = "v_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double v3;
+
+    @TableField(value = "v_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double v4;
+
+    @TableField(value = "v_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double v5;
+
+    @TableField(value = "v_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double v6;
+
+    @TableField(value = "v_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double v7;
+
+    @TableField(value = "v_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double v8;
+
+    @TableField(value = "v_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double v9;
+
+    @TableField(value = "v_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double v10;
+
+    @TableField(value = "v_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double v11;
+
+    @TableField(value = "v_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double v12;
+
+    @TableField(value = "v_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double v13;
+
+    @TableField(value = "v_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double v14;
+
+    @TableField(value = "v_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double v15;
+
+    @TableField(value = "v_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double v16;
+
+    @TableField(value = "v_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double v17;
+
+    @TableField(value = "v_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double v18;
+
+    @TableField(value = "v_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double v19;
+
+    @TableField(value = "v_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double v20;
+
+    @TableField(value = "v_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double v21;
+
+    @TableField(value = "v_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double v22;
+
+    @TableField(value = "v_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double v23;
+
+    @TableField(value = "v_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double v24;
+
+    @TableField(value = "v_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double v25;
+
+    @TableField(value = "v_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double v26;
+
+    @TableField(value = "v_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double v27;
+
+    @TableField(value = "v_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double v28;
+
+    @TableField(value = "v_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double v29;
+
+    @TableField(value = "v_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double v30;
+
+    @TableField(value = "v_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double v31;
+
+    @TableField(value = "v_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double v32;
+
+    @TableField(value = "v_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double v33;
+
+    @TableField(value = "v_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double v34;
+
+    @TableField(value = "v_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double v35;
+
+    @TableField(value = "v_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double v36;
+
+    @TableField(value = "v_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double v37;
+
+    @TableField(value = "v_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double v38;
+
+    @TableField(value = "v_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double v39;
+
+    @TableField(value = "v_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double v40;
+
+    @TableField(value = "v_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double v41;
+
+    @TableField(value = "v_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double v42;
+
+    @TableField(value = "v_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double v43;
+
+    @TableField(value = "v_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double v44;
+
+    @TableField(value = "v_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double v45;
+
+    @TableField(value = "v_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double v46;
+
+    @TableField(value = "v_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double v47;
+
+    @TableField(value = "v_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double v48;
+
+    @TableField(value = "v_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double v49;
+
+    @TableField(value = "v_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double v50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataID.java

@@ -0,0 +1,209 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "r_stat_data_i_d")
+public class RStatDataID implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "i_neg",updateStrategy = FieldStrategy.IGNORED)
+    private Double iNeg;
+
+    @TableField(value = "i_pos",updateStrategy = FieldStrategy.IGNORED)
+    private Double iPos;
+
+    @TableField(value = "i_thd",updateStrategy = FieldStrategy.IGNORED)
+    private Double iThd;
+
+    @TableField(value = "i_unbalance",updateStrategy = FieldStrategy.IGNORED)
+    private Double iUnbalance;
+
+    @TableField(value = "i_zero",updateStrategy = FieldStrategy.IGNORED)
+    private Double iZero;
+
+    @TableField(value = "rms",updateStrategy = FieldStrategy.IGNORED)
+    private Double rms;
+
+    @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double i1;
+
+    @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double i2;
+
+    @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double i3;
+
+    @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double i4;
+
+    @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double i5;
+
+    @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double i6;
+
+    @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double i7;
+
+    @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double i8;
+
+    @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double i9;
+
+    @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double i10;
+
+    @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double i11;
+
+    @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double i12;
+
+    @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double i13;
+
+    @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double i14;
+
+    @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double i15;
+
+    @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double i16;
+
+    @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double i17;
+
+    @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double i18;
+
+    @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double i19;
+
+    @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double i20;
+
+    @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double i21;
+
+    @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double i22;
+
+    @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double i23;
+
+    @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double i24;
+
+    @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double i25;
+
+    @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double i26;
+
+    @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double i27;
+
+    @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double i28;
+
+    @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double i29;
+
+    @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double i30;
+
+    @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double i31;
+
+    @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double i32;
+
+    @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double i33;
+
+    @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double i34;
+
+    @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double i35;
+
+    @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double i36;
+
+    @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double i37;
+
+    @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double i38;
+
+    @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double i39;
+
+    @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double i40;
+
+    @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double i41;
+
+    @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double i42;
+
+    @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double i43;
+
+    @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double i44;
+
+    @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double i45;
+
+    @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double i46;
+
+    @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double i47;
+
+    @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double i48;
+
+    @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double i49;
+
+    @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double i50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmID.java

@@ -0,0 +1,191 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_INHARM_I_D")
+public class RStatDataInHarmID implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double i1;
+
+    @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double i2;
+
+    @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double i3;
+
+    @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double i4;
+
+    @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double i5;
+
+    @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double i6;
+
+    @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double i7;
+
+    @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double i8;
+
+    @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double i9;
+
+    @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double i10;
+
+    @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double i11;
+
+    @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double i12;
+
+    @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double i13;
+
+    @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double i14;
+
+    @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double i15;
+
+    @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double i16;
+
+    @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double i17;
+
+    @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double i18;
+
+    @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double i19;
+
+    @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double i20;
+
+    @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double i21;
+
+    @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double i22;
+
+    @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double i23;
+
+    @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double i24;
+
+    @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double i25;
+
+    @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double i26;
+
+    @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double i27;
+
+    @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double i28;
+
+    @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double i29;
+
+    @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double i30;
+
+    @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double i31;
+
+    @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double i32;
+
+    @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double i33;
+
+    @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double i34;
+
+    @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double i35;
+
+    @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double i36;
+
+    @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double i37;
+
+    @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double i38;
+
+    @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double i39;
+
+    @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double i40;
+
+    @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double i41;
+
+    @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double i42;
+
+    @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double i43;
+
+    @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double i44;
+
+    @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double i45;
+
+    @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double i46;
+
+    @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double i47;
+
+    @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double i48;
+
+    @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double i49;
+
+    @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double i50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmVD.java

@@ -0,0 +1,191 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_INHARM_V_D")
+public class RStatDataInHarmVD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "v_1",updateStrategy = FieldStrategy.IGNORED)
+    private Double v1;
+
+    @TableField(value = "v_2",updateStrategy = FieldStrategy.IGNORED)
+    private Double v2;
+
+    @TableField(value = "v_3",updateStrategy = FieldStrategy.IGNORED)
+    private Double v3;
+
+    @TableField(value = "v_4",updateStrategy = FieldStrategy.IGNORED)
+    private Double v4;
+
+    @TableField(value = "v_5",updateStrategy = FieldStrategy.IGNORED)
+    private Double v5;
+
+    @TableField(value = "v_6",updateStrategy = FieldStrategy.IGNORED)
+    private Double v6;
+
+    @TableField(value = "v_7",updateStrategy = FieldStrategy.IGNORED)
+    private Double v7;
+
+    @TableField(value = "v_8",updateStrategy = FieldStrategy.IGNORED)
+    private Double v8;
+
+    @TableField(value = "v_9",updateStrategy = FieldStrategy.IGNORED)
+    private Double v9;
+
+    @TableField(value = "v_10",updateStrategy = FieldStrategy.IGNORED)
+    private Double v10;
+
+    @TableField(value = "v_11",updateStrategy = FieldStrategy.IGNORED)
+    private Double v11;
+
+    @TableField(value = "v_12",updateStrategy = FieldStrategy.IGNORED)
+    private Double v12;
+
+    @TableField(value = "v_13",updateStrategy = FieldStrategy.IGNORED)
+    private Double v13;
+
+    @TableField(value = "v_14",updateStrategy = FieldStrategy.IGNORED)
+    private Double v14;
+
+    @TableField(value = "v_15",updateStrategy = FieldStrategy.IGNORED)
+    private Double v15;
+
+    @TableField(value = "v_16",updateStrategy = FieldStrategy.IGNORED)
+    private Double v16;
+
+    @TableField(value = "v_17",updateStrategy = FieldStrategy.IGNORED)
+    private Double v17;
+
+    @TableField(value = "v_18",updateStrategy = FieldStrategy.IGNORED)
+    private Double v18;
+
+    @TableField(value = "v_19",updateStrategy = FieldStrategy.IGNORED)
+    private Double v19;
+
+    @TableField(value = "v_20",updateStrategy = FieldStrategy.IGNORED)
+    private Double v20;
+
+    @TableField(value = "v_21",updateStrategy = FieldStrategy.IGNORED)
+    private Double v21;
+
+    @TableField(value = "v_22",updateStrategy = FieldStrategy.IGNORED)
+    private Double v22;
+
+    @TableField(value = "v_23",updateStrategy = FieldStrategy.IGNORED)
+    private Double v23;
+
+    @TableField(value = "v_24",updateStrategy = FieldStrategy.IGNORED)
+    private Double v24;
+
+    @TableField(value = "v_25",updateStrategy = FieldStrategy.IGNORED)
+    private Double v25;
+
+    @TableField(value = "v_26",updateStrategy = FieldStrategy.IGNORED)
+    private Double v26;
+
+    @TableField(value = "v_27",updateStrategy = FieldStrategy.IGNORED)
+    private Double v27;
+
+    @TableField(value = "v_28",updateStrategy = FieldStrategy.IGNORED)
+    private Double v28;
+
+    @TableField(value = "v_29",updateStrategy = FieldStrategy.IGNORED)
+    private Double v29;
+
+    @TableField(value = "v_30",updateStrategy = FieldStrategy.IGNORED)
+    private Double v30;
+
+    @TableField(value = "v_31",updateStrategy = FieldStrategy.IGNORED)
+    private Double v31;
+
+    @TableField(value = "v_32",updateStrategy = FieldStrategy.IGNORED)
+    private Double v32;
+
+    @TableField(value = "v_33",updateStrategy = FieldStrategy.IGNORED)
+    private Double v33;
+
+    @TableField(value = "v_34",updateStrategy = FieldStrategy.IGNORED)
+    private Double v34;
+
+    @TableField(value = "v_35",updateStrategy = FieldStrategy.IGNORED)
+    private Double v35;
+
+    @TableField(value = "v_36",updateStrategy = FieldStrategy.IGNORED)
+    private Double v36;
+
+    @TableField(value = "v_37",updateStrategy = FieldStrategy.IGNORED)
+    private Double v37;
+
+    @TableField(value = "v_38",updateStrategy = FieldStrategy.IGNORED)
+    private Double v38;
+
+    @TableField(value = "v_39",updateStrategy = FieldStrategy.IGNORED)
+    private Double v39;
+
+    @TableField(value = "v_40",updateStrategy = FieldStrategy.IGNORED)
+    private Double v40;
+
+    @TableField(value = "v_41",updateStrategy = FieldStrategy.IGNORED)
+    private Double v41;
+
+    @TableField(value = "v_42",updateStrategy = FieldStrategy.IGNORED)
+    private Double v42;
+
+    @TableField(value = "v_43",updateStrategy = FieldStrategy.IGNORED)
+    private Double v43;
+
+    @TableField(value = "v_44",updateStrategy = FieldStrategy.IGNORED)
+    private Double v44;
+
+    @TableField(value = "v_45",updateStrategy = FieldStrategy.IGNORED)
+    private Double v45;
+
+    @TableField(value = "v_46",updateStrategy = FieldStrategy.IGNORED)
+    private Double v46;
+
+    @TableField(value = "v_47",updateStrategy = FieldStrategy.IGNORED)
+    private Double v47;
+
+    @TableField(value = "v_48",updateStrategy = FieldStrategy.IGNORED)
+    private Double v48;
+
+    @TableField(value = "v_49",updateStrategy = FieldStrategy.IGNORED)
+    private Double v49;
+
+    @TableField(value = "v_50",updateStrategy = FieldStrategy.IGNORED)
+    private Double v50;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataPltD.java

@@ -0,0 +1,44 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xy
+ * @version 1.0.0
+ */
+@Data
+@TableName(value = "R_STAT_DATA_PLT_D")
+public class RStatDataPltD implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time")
+    private LocalDate time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @MppMultiId
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    @MppMultiId
+    @TableField(value = "value_type")
+    private String valueType;
+
+    @TableField(value = "quality_flag")
+    private Integer qualityFlag;
+
+    @TableField(value = "plt",updateStrategy = FieldStrategy.IGNORED)
+    private Double plt;
+
+}

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataVD.java

@@ -1,7 +1,6 @@
 package com.njcn.dataProcess.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
 
@@ -37,187 +36,187 @@ public class RStatDataVD implements Serializable {
     @TableField(value = "quality_flag")
     private Integer qualityFlag;
 
-    @TableField(value = "freq")
+    @TableField(value = "freq",updateStrategy = FieldStrategy.IGNORED)
     private Double freq;
 
-    @TableField(value = "freq_dev")
+    @TableField(value = "freq_dev",updateStrategy = FieldStrategy.IGNORED)
     private Double freqDev;
 
-    @TableField(value = "rms")
+    @TableField(value = "rms",updateStrategy = FieldStrategy.IGNORED)
     private Double rms;
 
-    @TableField(value = "rms_lvr")
+    @TableField(value = "rms_lvr",updateStrategy = FieldStrategy.IGNORED)
     private Double rmsLvr;
 
-    @TableField(value = "v_neg")
+    @TableField(value = "v_neg",updateStrategy = FieldStrategy.IGNORED)
     private Double vNeg;
 
-    @TableField(value = "v_pos")
+    @TableField(value = "v_pos",updateStrategy = FieldStrategy.IGNORED)
     private Double vPos;
 
-    @TableField(value = "v_thd")
+    @TableField(value = "v_thd",updateStrategy = FieldStrategy.IGNORED)
     private Double vThd;
 
-    @TableField(value = "v_unbalance")
+    @TableField(value = "v_unbalance",updateStrategy = FieldStrategy.IGNORED)
     private Double vUnbalance;
 
-    @TableField(value = "v_zero")
+    @TableField(value = "v_zero",updateStrategy = FieldStrategy.IGNORED)
     private Double vZero;
 
-    @TableField(value = "vl_dev")
+    @TableField(value = "vl_dev",updateStrategy = FieldStrategy.IGNORED)
     private Double vlDev;
 
-    @TableField(value = "vu_dev")
+    @TableField(value = "vu_dev",updateStrategy = FieldStrategy.IGNORED)
     private Double vuDev;
 
-    @TableField(value = "v_1")
+    @TableField(value = "v_1",updateStrategy = FieldStrategy.IGNORED)
     private Double v1;
 
-    @TableField(value = "v_2")
+    @TableField(value = "v_2",updateStrategy = FieldStrategy.IGNORED)
     private Double v2;
 
-    @TableField(value = "v_3")
+    @TableField(value = "v_3",updateStrategy = FieldStrategy.IGNORED)
     private Double v3;
 
-    @TableField(value = "v_4")
+    @TableField(value = "v_4",updateStrategy = FieldStrategy.IGNORED)
     private Double v4;
 
-    @TableField(value = "v_5")
+    @TableField(value = "v_5",updateStrategy = FieldStrategy.IGNORED)
     private Double v5;
 
-    @TableField(value = "v_6")
+    @TableField(value = "v_6",updateStrategy = FieldStrategy.IGNORED)
     private Double v6;
 
-    @TableField(value = "v_7")
+    @TableField(value = "v_7",updateStrategy = FieldStrategy.IGNORED)
     private Double v7;
 
-    @TableField(value = "v_8")
+    @TableField(value = "v_8",updateStrategy = FieldStrategy.IGNORED)
     private Double v8;
 
-    @TableField(value = "v_9")
+    @TableField(value = "v_9",updateStrategy = FieldStrategy.IGNORED)
     private Double v9;
 
-    @TableField(value = "v_10")
+    @TableField(value = "v_10",updateStrategy = FieldStrategy.IGNORED)
     private Double v10;
 
-    @TableField(value = "v_11")
+    @TableField(value = "v_11",updateStrategy = FieldStrategy.IGNORED)
     private Double v11;
 
-    @TableField(value = "v_12")
+    @TableField(value = "v_12",updateStrategy = FieldStrategy.IGNORED)
     private Double v12;
 
-    @TableField(value = "v_13")
+    @TableField(value = "v_13",updateStrategy = FieldStrategy.IGNORED)
     private Double v13;
 
-    @TableField(value = "v_14")
+    @TableField(value = "v_14",updateStrategy = FieldStrategy.IGNORED)
     private Double v14;
 
-    @TableField(value = "v_15")
+    @TableField(value = "v_15",updateStrategy = FieldStrategy.IGNORED)
     private Double v15;
 
-    @TableField(value = "v_16")
+    @TableField(value = "v_16",updateStrategy = FieldStrategy.IGNORED)
     private Double v16;
 
-    @TableField(value = "v_17")
+    @TableField(value = "v_17",updateStrategy = FieldStrategy.IGNORED)
     private Double v17;
 
-    @TableField(value = "v_18")
+    @TableField(value = "v_18",updateStrategy = FieldStrategy.IGNORED)
     private Double v18;
 
-    @TableField(value = "v_19")
+    @TableField(value = "v_19",updateStrategy = FieldStrategy.IGNORED)
     private Double v19;
 
-    @TableField(value = "v_20")
+    @TableField(value = "v_20",updateStrategy = FieldStrategy.IGNORED)
     private Double v20;
 
-    @TableField(value = "v_21")
+    @TableField(value = "v_21",updateStrategy = FieldStrategy.IGNORED)
     private Double v21;
 
-    @TableField(value = "v_22")
+    @TableField(value = "v_22",updateStrategy = FieldStrategy.IGNORED)
     private Double v22;
 
-    @TableField(value = "v_23")
+    @TableField(value = "v_23",updateStrategy = FieldStrategy.IGNORED)
     private Double v23;
 
-    @TableField(value = "v_24")
+    @TableField(value = "v_24",updateStrategy = FieldStrategy.IGNORED)
     private Double v24;
 
-    @TableField(value = "v_25")
+    @TableField(value = "v_25",updateStrategy = FieldStrategy.IGNORED)
     private Double v25;
 
-    @TableField(value = "v_26")
+    @TableField(value = "v_26",updateStrategy = FieldStrategy.IGNORED)
     private Double v26;
 
-    @TableField(value = "v_27")
+    @TableField(value = "v_27",updateStrategy = FieldStrategy.IGNORED)
     private Double v27;
 
-    @TableField(value = "v_28")
+    @TableField(value = "v_28",updateStrategy = FieldStrategy.IGNORED)
     private Double v28;
 
-    @TableField(value = "v_29")
+    @TableField(value = "v_29",updateStrategy = FieldStrategy.IGNORED)
     private Double v29;
 
-    @TableField(value = "v_30")
+    @TableField(value = "v_30",updateStrategy = FieldStrategy.IGNORED)
     private Double v30;
 
-    @TableField(value = "v_31")
+    @TableField(value = "v_31",updateStrategy = FieldStrategy.IGNORED)
     private Double v31;
 
-    @TableField(value = "v_32")
+    @TableField(value = "v_32",updateStrategy = FieldStrategy.IGNORED)
     private Double v32;
 
-    @TableField(value = "v_33")
+    @TableField(value = "v_33",updateStrategy = FieldStrategy.IGNORED)
     private Double v33;
 
-    @TableField(value = "v_34")
+    @TableField(value = "v_34",updateStrategy = FieldStrategy.IGNORED)
     private Double v34;
 
-    @TableField(value = "v_35")
+    @TableField(value = "v_35",updateStrategy = FieldStrategy.IGNORED)
     private Double v35;
 
-    @TableField(value = "v_36")
+    @TableField(value = "v_36",updateStrategy = FieldStrategy.IGNORED)
     private Double v36;
 
-    @TableField(value = "v_37")
+    @TableField(value = "v_37",updateStrategy = FieldStrategy.IGNORED)
     private Double v37;
 
-    @TableField(value = "v_38")
+    @TableField(value = "v_38",updateStrategy = FieldStrategy.IGNORED)
     private Double v38;
 
-    @TableField(value = "v_39")
+    @TableField(value = "v_39",updateStrategy = FieldStrategy.IGNORED)
     private Double v39;
 
-    @TableField(value = "v_40")
+    @TableField(value = "v_40",updateStrategy = FieldStrategy.IGNORED)
     private Double v40;
 
-    @TableField(value = "v_41")
+    @TableField(value = "v_41",updateStrategy = FieldStrategy.IGNORED)
     private Double v41;
 
-    @TableField(value = "v_42")
+    @TableField(value = "v_42",updateStrategy = FieldStrategy.IGNORED)
     private Double v42;
 
-    @TableField(value = "v_43")
+    @TableField(value = "v_43",updateStrategy = FieldStrategy.IGNORED)
     private Double v43;
 
-    @TableField(value = "v_44")
+    @TableField(value = "v_44",updateStrategy = FieldStrategy.IGNORED)
     private Double v44;
 
-    @TableField(value = "v_45")
+    @TableField(value = "v_45",updateStrategy = FieldStrategy.IGNORED)
     private Double v45;
 
-    @TableField(value = "v_46")
+    @TableField(value = "v_46",updateStrategy = FieldStrategy.IGNORED)
     private Double v46;
 
-    @TableField(value = "v_47")
+    @TableField(value = "v_47",updateStrategy = FieldStrategy.IGNORED)
     private Double v47;
 
-    @TableField(value = "v_48")
+    @TableField(value = "v_48",updateStrategy = FieldStrategy.IGNORED)
     private Double v48;
 
-    @TableField(value = "v_49")
+    @TableField(value = "v_49",updateStrategy = FieldStrategy.IGNORED)
     private Double v49;
 
-    @TableField(value = "v_50")
+    @TableField(value = "v_50",updateStrategy = FieldStrategy.IGNORED)
     private Double v50;
 
 }

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

@@ -0,0 +1,20 @@
+package com.njcn.dataProcess.util;
+
+/**
+ * @author xy
+ * @description 公共方法
+ */
+
+public class DataCommonUtils {
+
+    /**
+     * 传入字典类型的电压等级，获取可以计算的数据
+     * 例如 35kV->32.0
+     *     0.38kV->0.38
+     */
+    public static Double getVoltageData(String lineVoltage) {
+        String numberStr = lineVoltage.replace("kV", "");
+        return Double.parseDouble(numberStr);
+    }
+
+}

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

@@ -27,6 +27,24 @@ public class TimeUtils {
         return dateTime.toLocalDate();
     }
 
+    /**
+     * String类型的yyyy-MM-dd HH:mm:ss转成LocalDataTime yyyy-MM-dd HH:mm:ss
+     * @param time
+     * @return LocalDataTime
+     */
+    public static LocalDateTime StringToLocalDateTime(String time) {
+        return LocalDateTime.parse(time, DATE_TIME_FORMATTER);
+    }
+
+    /**
+     * LocalDataTime类型的yyyy-MM-dd HH:mm:ss转成String yyyy-MM-dd HH:mm:ss
+     * @param time
+     * @return LocalDataTime
+     */
+    public static String LocalDateTimeToString(LocalDateTime time) {
+        return time.format(DATE_TIME_FORMATTER);
+    }
+
     /**
      * String类型的yyyy-MM-dd转成yyyy-MM-dd
      * @param time

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java

@@ -6,10 +6,13 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
 import com.njcn.dataProcess.dto.DataFlickerDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataFlickerDto;
+import com.njcn.dataProcess.pojo.dto.DataIDto;
 import com.njcn.dataProcess.service.IDataFlicker;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -54,9 +57,31 @@ public class DataFlickerController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataFlickerDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataFlickerDto> data = dataFlickerQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getBaseData")
+    @ApiOperation("获取算法基础数据")
+    public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getBaseData");
+        List<CommonMinuteDto> data = dataFlickerQuery.getBaseData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
-
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addList")
+    @ApiOperation("关系型数据库插入数据")
+    public HttpResult<String> addList(@RequestBody List<DataFlickerDto> dataFlickerDtoList) {
+        String methodDescribe = getMethodDescribe("addList");
+        dataFlickerInsert.addList(dataFlickerDtoList);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
+    }
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java

@@ -6,9 +6,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.dto.DataFlucDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.dto.DataFlucDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataFlucDto;
 import com.njcn.dataProcess.service.IDataFluc;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -42,7 +45,6 @@ public class DataFlucController extends BaseController {
     @InsertBean
     private IDataFluc dataFlucInsert;
 
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
     @PostMapping("/batchInsertion")
     @ApiOperation("批量插入")
@@ -53,9 +55,31 @@ public class DataFlucController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataFlucDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataFlucDto> data = dataFlucQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getBaseData")
+    @ApiOperation("获取算法基础数据")
+    public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getBaseData");
+        List<CommonMinuteDto> data = dataFlucQuery.getBaseData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
-
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addList")
+    @ApiOperation("关系型数据库插入数据")
+    public HttpResult<String> addList(@RequestBody List<DataFlucDto> dataFlucDtoList) {
+        String methodDescribe = getMethodDescribe("addList");
+        dataFlucInsert.addList(dataFlucDtoList);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
+    }
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java

@@ -0,0 +1,55 @@
+package com.njcn.dataProcess.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.dataProcess.annotation.InsertBean;
+import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.dataProcess.service.IDataHarmRateV;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+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.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0
+ * @data 2024/11/6 19:48
+ */
+@Validated
+@Slf4j
+@Controller
+@RestController
+@RequestMapping("/dataHarmRateV")
+@Api(tags = "谐波电压含有率")
+public class DataHarmRateVController extends BaseController {
+
+    @QueryBean
+    private IDataHarmRateV dataHarmRateVQuery;
+
+    @InsertBean
+    private IDataHarmRateV dataHarmRateVInsert;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataHarmDto> data = dataHarmRateVQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java

@@ -6,9 +6,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto;
 import com.njcn.dataProcess.service.IDataHarmphasicI;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,7 +56,23 @@ public class DataHarmphasicIController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getBaseData")
+    @ApiOperation("获取算法基础数据")
+    public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getBaseData");
+        List<CommonMinuteDto> data = dataHarmphasicIQuery.getBaseData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addList")
+    @ApiOperation("关系型数据库插入数据")
+    public HttpResult<String> addList(@RequestBody List<DataHarmPhasicIDto> list) {
+        String methodDescribe = getMethodDescribe("addList");
+        dataHarmphasicIInsert.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
+    }
 
 
 

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java

@@ -6,9 +6,14 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.dto.DataHarmphasicVDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.dto.DataHarmphasicVDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto;
 import com.njcn.dataProcess.service.IDataHarmphasicV;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,9 +58,31 @@ public class DataHarmphasicVController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataHarmDto> data = dataHarmphasicVQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getBaseData")
+    @ApiOperation("获取算法基础数据")
+    public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getBaseData");
+        List<CommonMinuteDto> data = dataHarmphasicVQuery.getBaseData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
-
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addList")
+    @ApiOperation("关系型数据库插入数据")
+    public HttpResult<String> addList(@RequestBody List<DataHarmPhasicVDto> list) {
+        String methodDescribe = getMethodDescribe("addList");
+        dataHarmphasicVInsert.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
+    }
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java

@@ -6,9 +6,14 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.dto.DataHarmpowerPDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.dto.DataHarmpowerPDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto;
+import com.njcn.dataProcess.pojo.dto.DataPowerPDto;
 import com.njcn.dataProcess.service.IDataHarmpowerP;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,9 +58,31 @@ public class DataHarmpowerPController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataPowerPDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataPowerPDto> data = dataHarmpowerPQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getBaseData")
+    @ApiOperation("获取算法基础数据")
+    public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getBaseData");
+        List<CommonMinuteDto> data = dataHarmpowerPQuery.getBaseData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
-
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addList")
+    @ApiOperation("关系型数据库插入数据")
+    public HttpResult<String> addList(@RequestBody List<DataHarmPowerPDto> list) {
+        String methodDescribe = getMethodDescribe("addList");
+        dataHarmpowerPInsert.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
+    }
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java

@@ -9,6 +9,10 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.dataProcess.dto.DataHarmpowerQDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto;
 import com.njcn.dataProcess.service.IDataHarmpowerQ;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,7 +57,23 @@ public class DataHarmpowerQController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getBaseData")
+    @ApiOperation("获取算法基础数据")
+    public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getBaseData");
+        List<CommonMinuteDto> data = dataHarmpowerQQuery.getBaseData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addList")
+    @ApiOperation("关系型数据库插入数据")
+    public HttpResult<String> addList(@RequestBody List<DataHarmPowerQDto> list) {
+        String methodDescribe = getMethodDescribe("addList");
+        dataHarmpowerQInsert.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
+    }
 
 
 

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataIController.java

@@ -6,9 +6,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.dto.DataIDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.dto.DataIDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataIDto;
 import com.njcn.dataProcess.service.IDataI;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,9 +56,31 @@ public class DataIController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataIDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataIDto> data = dataIQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getBaseData")
+    @ApiOperation("获取算法基础数据")
+    public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getBaseData");
+        List<CommonMinuteDto> data = dataIQuery.getBaseData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
-
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addList")
+    @ApiOperation("关系型数据库插入数据")
+    public HttpResult<String> addList(@RequestBody List<DataIDto> dataIDtoList) {
+        String methodDescribe = getMethodDescribe("addList");
+        dataIInsert.addList(dataIDtoList);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
+    }
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java

@@ -9,6 +9,8 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.dataProcess.dto.DataInharmVDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
 import com.njcn.dataProcess.service.IDataInharmV;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,9 +55,14 @@ public class DataInharmVController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
-
-
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataHarmDto> data = dataInharmVQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataPltController.java

@@ -6,9 +6,11 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.dto.DataPltDTO;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.dto.DataPltDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataPltDto;
 import com.njcn.dataProcess.service.IDataPlt;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,9 +55,14 @@ public class DataPltController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
-
-
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataPltDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataPltDto> data = dataPltQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
 
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java

@@ -105,9 +105,10 @@ public class DataVController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
     @PostMapping("/addInfluxDbList")
     @ApiOperation("时序数据库插入数据")
+    @Deprecated
     public HttpResult<String> addInfluxDbList(@RequestBody List<DataVDto> dataVList) {
         String methodDescribe = getMethodDescribe("addInfluxDbList");
-        dataVInsert.addInfluxDbList(dataVList);
+        dataVQuery.addInfluxDbList(dataVList);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/PqDataVerifyController.java

@@ -0,0 +1,57 @@
+package com.njcn.dataProcess.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.po.PqDataVerify;
+import com.njcn.dataProcess.service.IPqDataVerifyService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
+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 javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2025-02-17
+ */
+@RestController
+@RequestMapping("/pqDataVerify")
+public class PqDataVerifyController extends BaseController {
+
+    @Resource
+    private IPqDataVerifyService pqDataVerifyService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/insertData")
+    @ApiOperation("存储清洗的异常数据")
+    public HttpResult<List<PqDataVerify>> insertData(@RequestBody List<PqDataVerify> list) {
+        String methodDescribe = getMethodDescribe("insertData");
+        pqDataVerifyService.insertData(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/queryData")
+    @ApiOperation("查询清洗的异常数据")
+    public HttpResult<List<PqDataVerify>> queryData(@RequestBody LineCountEvaluateParam param) {
+        String methodDescribe = getMethodDescribe("queryData");
+        List<PqDataVerify> list = pqDataVerifyService.queryData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}
+

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/PqReasonableRangeController.java

@@ -0,0 +1,56 @@
+package com.njcn.dataProcess.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.dataProcess.param.DataCleanParam;
+import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+import com.njcn.dataProcess.service.IPqReasonableRangeService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+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 javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2025-02-13
+ */
+@Validated
+@Slf4j
+@Controller
+@RestController
+@RequestMapping("/pqReasonableRange")
+@Api(tags = "数据清洗标准库")
+public class PqReasonableRangeController extends BaseController {
+
+    @Resource
+    private IPqReasonableRangeService pqReasonableRangeService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getData")
+    @ApiOperation("按条件获取数据合理范围")
+    public HttpResult<List<PqReasonableRangeDto>> getData(@RequestBody DataCleanParam param) {
+        String methodDescribe = getMethodDescribe("getData");
+        List<PqReasonableRangeDto> list = pqReasonableRangeService.getReasonableRangeList(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}
+

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmRateVMapper.java

@@ -0,0 +1,14 @@
+package com.njcn.dataProcess.dao.imapper;
+
+import com.njcn.dataProcess.po.influx.DataHarmrateV;
+import com.njcn.influx.base.InfluxDbBaseMapper;
+
+
+/**
+ * @author xy
+ */
+public interface DataHarmRateVMapper extends InfluxDbBaseMapper<DataHarmrateV> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/PqDataVerifyMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.PqDataVerify;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2025-02-17
+ */
+public interface PqDataVerifyMapper extends MppBaseMapper<PqDataVerify> {
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/PqReasonableRangeMapper.java

@@ -0,0 +1,18 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+import com.njcn.dataProcess.pojo.po.PqReasonableRange;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2025-02-13
+ */
+public interface PqReasonableRangeMapper extends BaseMapper<PqReasonableRange> {
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlickerRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataFlickerD;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataFlickerRelationMapper extends MppBaseMapper<RStatDataFlickerD> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlucRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataFlucD;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataFlucRelationMapper extends MppBaseMapper<RStatDataFlucD> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicIRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataHarmPhasicIRelationMapper extends MppBaseMapper<RStatDataHarmPhasicID> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicVRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicVD;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataHarmPhasicVRelationMapper extends MppBaseMapper<RStatDataHarmPhasicVD> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerPRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerPD;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataHarmPowerPRelationMapper extends MppBaseMapper<RStatDataHarmPowerPD> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerQRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerQD;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataHarmPowerQRelationMapper extends MppBaseMapper<RStatDataHarmPowerQD> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerSRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerSD;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataHarmPowerSRelationMapper extends MppBaseMapper<RStatDataHarmPowerSD> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateIRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmRateID;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataHarmRateIRelationMapper extends MppBaseMapper<RStatDataHarmRateID> {
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateVRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmRateVD;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ */
+public interface RStatDataHarmRateVRelationMapper extends MppBaseMapper<RStatDataHarmRateVD> {
+
+
+
+}