完成综合评估算法

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

@@ -0,0 +1,30 @@
+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.DataComAssFeignClientFallbackFactory;
+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.DataComassesDPO;
+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;
+
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年01月05日 15:11
+ */
+@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataComAss", fallbackFactory = DataComAssFeignClientFallbackFactory.class, contextId = "dataComAss")
+public interface DataComAssFeignClient {
+
+    @PostMapping("/batchInsertion")
+    HttpResult<String> batchInsertion(@RequestBody List<DataComassesDPO> dataIDTOList);
+
+
+}

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

@@ -0,0 +1,25 @@
+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.DataPollutionFeignClientFallbackFactory;
+import com.njcn.dataProcess.pojo.dto.DataPollutionD;
+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 denghuajun
+ * @version 1.0.0
+ * @date 2022年01月05日 15:11
+ */
+@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataPollution", fallbackFactory = DataPollutionFeignClientFallbackFactory.class, contextId = "dataPollution")
+public interface DataPollutionFeignClient {
+
+    @PostMapping("/batchInsertion")
+    HttpResult<String> batchInsertion(@RequestBody List<DataPollutionD> dataIDTOList);
+
+
+}

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

@@ -0,0 +1,49 @@
+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.DataComAssFeignClient;
+import com.njcn.dataProcess.pojo.dto.DataComassesDPO;
+import com.njcn.dataProcess.util.DataProcessingEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/19 10:19
+ */
+@Slf4j
+@Component
+public class DataComAssFeignClientFallbackFactory implements FallbackFactory<DataComAssFeignClient> {
+
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public DataComAssFeignClient 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 DataComAssFeignClient() {
+
+            @Override
+            public HttpResult<String> batchInsertion(List<DataComassesDPO> dataFlucDTOList) {
+                log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+
+        };
+    }
+}

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

@@ -0,0 +1,58 @@
+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.DataPollutionFeignClient;
+import com.njcn.dataProcess.api.DataVFeignClient;
+import com.njcn.dataProcess.dto.DataVDTO;
+import com.njcn.dataProcess.dto.MeasurementCountDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataPollutionD;
+import com.njcn.dataProcess.pojo.dto.DataVCvtDto;
+import com.njcn.dataProcess.pojo.dto.DataVDto;
+import com.njcn.dataProcess.util.DataProcessingEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年01月05日 15:08
+ */
+@Slf4j
+@Component
+public class DataPollutionFeignClientFallbackFactory implements FallbackFactory<DataPollutionFeignClient> {
+
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public DataPollutionFeignClient 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 DataPollutionFeignClient() {
+
+            @Override
+            public HttpResult<String> batchInsertion(List<DataPollutionD> dataVDTOList) {
+                log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+
+        };
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计日表
+ * @Author: wr
+ * @Date: 2025/3/19 14:13
+ */
+@Data
+public class DataPollutionD implements Serializable {
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(value = "监测点")
+    private String lineId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value = "时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value = "污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value = "统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,41 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计日表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+
+@Data
+public class DataPollutionOrgD implements Serializable {
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计月表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+@Data
+public class DataPollutionOrgM implements Serializable {
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计季表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+@Data
+public class DataPollutionOrgQ implements Serializable {
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计年表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+@Data
+public class DataPollutionOrgY implements Serializable {
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计日表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+public class DataPollutionSubstationD implements Serializable {
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value = "时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value = "污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value = "统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计月表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+public class DataPollutionSubstationM implements Serializable {
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value = "时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value = "污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value = "统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计季表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+public class DataPollutionSubstationQ implements Serializable {
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(value="变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计年表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+public class DataPollutionSubstationY implements Serializable {
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(value="变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+}

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

@@ -1,23 +1,28 @@
-package com.njcn.dataProcess.po.relation;
+package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDate;
 
 /**
- * @Author: cdf
- * @CreateTime: 2025-03-19
- * @Description: 监测点污区实体
+ * @Description: 单位污区图统计日表
+ * @Author: wr
+ * @Date: 2025/3/19 14:13
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName(value = "r_mp_pollution_d")
-public class RMpPollutionDPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
+public class RMpPollutionD implements Serializable {
+    /**
+     * 单位id
+     */
     @TableField(value = "line_id")
     @ApiModelProperty(value = "监测点")
     private String lineId;
@@ -43,5 +48,5 @@ public class RMpPollutionDPO implements Serializable {
     @ApiModelProperty(value = "统计值")
     private Double value;
 
-
-}
+    private static final long serialVersionUID = 1L;
+}

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

@@ -25,427 +25,427 @@ public class RStatLimitQualifiedD implements Serializable {
     @MppMultiId
     @TableField(value = "time_id")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate time;
+    private String time;
 
 
     /**
      * 闪变越限次数
      */
     @TableField(value = "flicker_overtime")
-    private Integer flickerOvertime;
+    private Double flickerOvertime;
 
 
     /**
      * 频率偏差越限次数
      */
     @TableField(value = "freq_dev_overtime")
-    private Integer freqDevOvertime;
+    private Double freqDevOvertime;
 
     /**
      * 电压偏差越限次数
      */
     @TableField(value = "voltage_dev_overtime")
-    private Integer voltageDevOvertime;
+    private Double voltageDevOvertime;
 
     /**
      * 三相电压不平衡度越限次数
      */
     @TableField(value = "ubalance_overtime")
-    private Integer ubalanceOvertime;
+    private Double ubalanceOvertime;
 
     /**
      * 电压谐波畸变率越限次数
      */
     @TableField(value = "uaberrance_overtime")
-    private Integer uaberranceOvertime;
+    private Double uaberranceOvertime;
 
     /**
      * 负序电流限值次数
      */
     @TableField(value = "i_neg_overtime")
-    private Integer iNegOvertime;
+    private Double iNegOvertime;
 
     /**
      * 2次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_2_overtime")
-    private Integer uharm2Overtime;
+    private Double uharm2Overtime;
 
     /**
      * 3次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_3_overtime")
-    private Integer uharm3Overtime;
+    private Double uharm3Overtime;
 
     /**
      * 4次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_4_overtime")
-    private Integer uharm4Overtime;
+    private Double uharm4Overtime;
 
     /**
      * 5次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_5_overtime")
-    private Integer uharm5Overtime;
+    private Double uharm5Overtime;
 
     /**
      * 6次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_6_overtime")
-    private Integer uharm6Overtime;
+    private Double uharm6Overtime;
 
     /**
      * 7次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_7_overtime")
-    private Integer uharm7Overtime;
+    private Double uharm7Overtime;
 
     /**
      * 8次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_8_overtime")
-    private Integer uharm8Overtime;
+    private Double uharm8Overtime;
 
     /**
      * 9次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_9_overtime")
-    private Integer uharm9Overtime;
+    private Double uharm9Overtime;
 
     /**
      * 10次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_10_overtime")
-    private Integer uharm10Overtime;
+    private Double uharm10Overtime;
 
     /**
      * 11次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_11_overtime")
-    private Integer uharm11Overtime;
+    private Double uharm11Overtime;
 
     /**
      * 12次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_12_overtime")
-    private Integer uharm12Overtime;
+    private Double uharm12Overtime;
 
     /**
      * 13次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_13_overtime")
-    private Integer uharm13Overtime;
+    private Double uharm13Overtime;
 
     /**
      * 14次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_14_overtime")
-    private Integer uharm14Overtime;
+    private Double uharm14Overtime;
 
     /**
      * 15次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_15_overtime")
-    private Integer uharm15Overtime;
+    private Double uharm15Overtime;
 
     /**
      * 16次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_16_overtime")
-    private Integer uharm16Overtime;
+    private Double uharm16Overtime;
 
     /**
      * 17次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_17_overtime")
-    private Integer uharm17Overtime;
+    private Double uharm17Overtime;
 
     /**
      * 18次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_18_overtime")
-    private Integer uharm18Overtime;
+    private Double uharm18Overtime;
 
     /**
      * 19次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_19_overtime")
-    private Integer uharm19Overtime;
+    private Double uharm19Overtime;
 
     /**
      * 20次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_20_overtime")
-    private Integer uharm20Overtime;
+    private Double uharm20Overtime;
 
     /**
      * 21次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_21_overtime")
-    private Integer uharm21Overtime;
+    private Double uharm21Overtime;
 
     /**
      * 22次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_22_overtime")
-    private Integer uharm22Overtime;
+    private Double uharm22Overtime;
 
     /**
      * 23次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_23_overtime")
-    private Integer uharm23Overtime;
+    private Double uharm23Overtime;
 
     /**
      * 24次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_24_overtime")
-    private Integer uharm24Overtime;
+    private Double uharm24Overtime;
 
     /**
      * 25次电压谐波含有率越限次数
      */
     @TableField(value = "uharm_25_overtime")
-    private Integer uharm25Overtime;
+    private Double uharm25Overtime;
 
     /**
      * 2次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_2_overtime")
-    private Integer iharm2Overtime;
+    private Double iharm2Overtime;
 
     /**
      * 3次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_3_overtime")
-    private Integer iharm3Overtime;
+    private Double iharm3Overtime;
 
     /**
      * 4次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_4_overtime")
-    private Integer iharm4Overtime;
+    private Double iharm4Overtime;
 
     /**
      * 5次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_5_overtime")
-    private Integer iharm5Overtime;
+    private Double iharm5Overtime;
 
     /**
      * 6次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_6_overtime")
-    private Integer iharm6Overtime;
+    private Double iharm6Overtime;
 
     /**
      * 7次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_7_overtime")
-    private Integer iharm7Overtime;
+    private Double iharm7Overtime;
 
     /**
      * 8次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_8_overtime")
-    private Integer iharm8Overtime;
+    private Double iharm8Overtime;
 
     /**
      * 9次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_9_overtime")
-    private Integer iharm9Overtime;
+    private Double iharm9Overtime;
 
     /**
      * 10次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_10_overtime")
-    private Integer iharm10Overtime;
+    private Double iharm10Overtime;
 
     /**
      * 11次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_11_overtime")
-    private Integer iharm11Overtime;
+    private Double iharm11Overtime;
 
     /**
      * 12次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_12_overtime")
-    private Integer iharm12Overtime;
+    private Double iharm12Overtime;
 
     /**
      * 13次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_13_overtime")
-    private Integer iharm13Overtime;
+    private Double iharm13Overtime;
 
     /**
      * 14次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_14_overtime")
-    private Integer iharm14Overtime;
+    private Double iharm14Overtime;
 
     /**
      * 15次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_15_overtime")
-    private Integer iharm15Overtime;
+    private Double iharm15Overtime;
 
     /**
      * 16次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_16_overtime")
-    private Integer iharm16Overtime;
+    private Double iharm16Overtime;
 
     /**
      * 17次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_17_overtime")
-    private Integer iharm17Overtime;
+    private Double iharm17Overtime;
 
     /**
      * 18次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_18_overtime")
-    private Integer iharm18Overtime;
+    private Double iharm18Overtime;
 
     /**
      * 19次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_19_overtime")
-    private Integer iharm19Overtime;
+    private Double iharm19Overtime;
 
     /**
      * 20次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_20_overtime")
-    private Integer iharm20Overtime;
+    private Double iharm20Overtime;
 
     /**
      * 21次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_21_overtime")
-    private Integer iharm21Overtime;
+    private Double iharm21Overtime;
 
     /**
      * 22次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_22_overtime")
-    private Integer iharm22Overtime;
+    private Double iharm22Overtime;
 
     /**
      * 23次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_23_overtime")
-    private Integer iharm23Overtime;
+    private Double iharm23Overtime;
 
     /**
      * 24次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_24_overtime")
-    private Integer iharm24Overtime;
+    private Double iharm24Overtime;
 
     /**
      * 25次电流谐波幅值越限次数
      */
     @TableField(value = "iharm_25_overtime")
-    private Integer iharm25Overtime;
+    private Double iharm25Overtime;
 
     /**
      * 0.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_1_overtime")
-    private Integer inuharm1Overtime;
+    private Double inuharm1Overtime;
 
     /**
      * 1.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_2_overtime")
-    private Integer inuharm2Overtime;
+    private Double inuharm2Overtime;
 
     /**
      * 2.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_3_overtime")
-    private Integer inuharm3Overtime;
+    private Double inuharm3Overtime;
 
     /**
      * 3.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_4_overtime")
-    private Integer inuharm4Overtime;
+    private Double inuharm4Overtime;
 
     /**
      * 4.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_5_overtime")
-    private Integer inuharm5Overtime;
+    private Double inuharm5Overtime;
 
     /**
      * 5.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_6_overtime")
-    private Integer inuharm6Overtime;
+    private Double inuharm6Overtime;
 
     /**
      * 6.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_7_overtime")
-    private Integer inuharm7Overtime;
+    private Double inuharm7Overtime;
 
     /**
      * 7.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_8_overtime")
-    private Integer inuharm8Overtime;
+    private Double inuharm8Overtime;
 
     /**
      * 8.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_9_overtime")
-    private Integer inuharm9Overtime;
+    private Double inuharm9Overtime;
 
     /**
      * 9.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_10_overtime")
-    private Integer inuharm10Overtime;
+    private Double inuharm10Overtime;
 
     /**
      * 10.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_11_overtime")
-    private Integer inuharm11Overtime;
+    private Double inuharm11Overtime;
 
     /**
      * 11.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_12_overtime")
-    private Integer inuharm12Overtime;
+    private Double inuharm12Overtime;
 
     /**
      * 12.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_13_overtime")
-    private Integer inuharm13Overtime;
+    private Double inuharm13Overtime;
 
     /**
      * 13.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_14_overtime")
-    private Integer inuharm14Overtime;
+    private Double inuharm14Overtime;
 
     /**
      * 14.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_15_overtime")
-    private Integer inuharm15Overtime;
+    private Double inuharm15Overtime;
 
     /**
      * 15.5次间谐波电压限值次数
      */
     @TableField(value = "inuharm_16_overtime")
-    private Integer inuharm16Overtime;
+    private Double inuharm16Overtime;
 }

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

@@ -0,0 +1,53 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计日表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_org_d")
+public class RStatPollutionOrgD implements Serializable {
+    /**
+     * 单位id
+     */
+    @TableField(value = "org_id")
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计月表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_org_m")
+public class RStatPollutionOrgM implements Serializable {
+    /**
+     * 单位id
+     */
+    @TableField(value = "org_id")
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计季表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_org_q")
+public class RStatPollutionOrgQ implements Serializable {
+    /**
+     * 单位id
+     */
+    @TableField(value = "org_id")
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 单位污区图统计年表
+ * @Author: wr
+ * @Date: 2025/3/19 14:15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_org_y")
+public class RStatPollutionOrgY implements Serializable {
+    /**
+     * 单位id
+     */
+    @TableField(value = "org_id")
+    @ApiModelProperty(value="单位id")
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计日表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_substation_d")
+public class RStatPollutionSubstationD implements Serializable {
+    /**
+     * 变电站id
+     */
+    @TableField(value = "substation_id")
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value = "时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value = "污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value = "统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计月表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_substation_m")
+public class RStatPollutionSubstationM implements Serializable {
+    /**
+     * 变电站id
+     */
+    @TableField(value = "substation_id")
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value = "时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value = "污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value = "统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计季表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_substation_q")
+public class RStatPollutionSubstationQ implements Serializable {
+    /**
+     * 变电站id
+     */
+    @TableField(value = "substation_id")
+    @ApiModelProperty(value="变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description: 变电站污区图统计年表
+ * @Author: wr
+ * @Date: 2025/3/19 14:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "r_stat_pollution_substation_y")
+public class RStatPollutionSubstationY implements Serializable {
+    /**
+     * 变电站id
+     */
+    @TableField(value = "substation_id")
+    @ApiModelProperty(value="变电站id")
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    @TableField(value = "data_date")
+    @ApiModelProperty(value="时间")
+    private LocalDate dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    @TableField(value = "pollution_type")
+    @ApiModelProperty(value="污区图统计类型")
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    @TableField(value = "value")
+    @ApiModelProperty(value="统计值")
+    private Double value;
+
+    private static final long serialVersionUID = 1L;
+}