完成监测点稳态指标合格率(天、月、季和年)

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/executor/DeviceExecutor.java

@@ -25,7 +25,7 @@ public class DeviceExecutor extends BaseExecutor {
 
 
     /**
-     * 算法名: 暂无-----终端在线率_日表(r_stat_onlinerate_d)
+     * 算法名: 终端在线率_日表(r_stat_onlinerate_d)
      *
      * @param bindCmp
      * @return

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/executor/MeasurementExecutor.java

@@ -358,6 +358,7 @@ public class MeasurementExecutor extends BaseExecutor {
         }
     }
 
+
     @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataLimitRate", nodeType = NodeTypeEnum.COMMON)
     public boolean dataLimitRateAccess(NodeComponent bindCmp) {
         return isAccess(bindCmp);
@@ -378,6 +379,22 @@ public class MeasurementExecutor extends BaseExecutor {
         dataCrossingService.limitTargetHandler(bindCmp.getRequestData());
     }
 
+    @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataLimitQualified", nodeType = NodeTypeEnum.COMMON)
+    public boolean dataLimitQualifiedAccess(NodeComponent bindCmp) {
+        return isAccess(bindCmp);
+    }
+
+    @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataLimitQualified", nodeType = NodeTypeEnum.COMMON)
+    public void dataLimitQualifiedProcess(NodeComponent bindCmp) {
+        dataCrossingService.limitQualifiedDayHandler(bindCmp.getRequestData());
+    }
+
+
+    /**
+     * 监测点数据完整性
+     * @param bindCmp
+     * @return
+     */
     @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataIntegrity", nodeType = NodeTypeEnum.COMMON)
     public boolean dataIntegrityAccess(NodeComponent bindCmp) {
         return isAccess(bindCmp);

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCrossingService.java

@@ -2,7 +2,7 @@ package com.njcn.algorithm.service.line;
 
 
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
-import com.njcn.dataProcess.pojo.dto.QualifiedDetail;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@ public interface IDataCrossingService  {
      * @Author: wr
      * @Date: 2025/3/12 16:03
      */
-    List<QualifiedDetail> limitQualifiedDayHandler(CalculatedParam calculatedParam);
+    void limitQualifiedDayHandler(CalculatedParam calculatedParam);
 
 
     /**
@@ -42,5 +42,27 @@ public interface IDataCrossingService  {
      * @Author: wr
      * @Date: 2025/3/12 16:03
      */
-    List<QualifiedDetail> limitQualifiedMonthHandler(CalculatedParam calculatedParam);
+    List<DataQualifiedDetail> limitQualifiedMonthHandler(CalculatedParam calculatedParam);
+
+
+    /**
+     * 监测点稳态指标合格率（季）
+     * @param calculatedParam
+     * @Author: wr
+     * @Date: 2025/3/12 16:03
+     */
+    List<DataQualifiedDetail> limitQualifiedQuarterHandler(CalculatedParam calculatedParam);
+
+    /**
+     * 监测点稳态指标合格率（年）
+     * @param calculatedParam
+     * @Author: wr
+     * @Date: 2025/3/12 16:03
+     */
+    List<DataQualifiedDetail> limitQualifiedYearHandler(CalculatedParam calculatedParam);
+
+
+
+
+
 }

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java

@@ -24,6 +24,7 @@ import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -71,6 +72,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
     private PqDataVerifyFeignClient pqDataVerifyFeignClient;
     @Resource
     private DataLimitTargetFeignClient dataLimitTargetFeignClient;
+    @Resource
+    private DataLimitQualifiedFeignClient dataLimitQualifiedFeignClient;
 
 
     @Override
@@ -260,33 +263,20 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
     }
 
     @Override
-    public List<QualifiedDetail> limitQualifiedDayHandler(CalculatedParam calculatedParam) {
+    public void limitQualifiedDayHandler(CalculatedParam calculatedParam) {
+        logger.info("{},r_stat_limit_qualified_d算法开始=====》", LocalDateTime.now());
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate()));
         List<String> lineIdList = calculatedParam.getIdList();
-        return getQualifiedDetails(calculatedParam, lineParam, lineIdList);
+        List<DataQualifiedDetail> info = new ArrayList<>();
-    }
-
-
-    @Override
-    public List<QualifiedDetail> limitQualifiedMonthHandler(CalculatedParam calculatedParam) {
-        LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
-        lineParam.setStartTime(TimeUtils.getBeginOfMonth(calculatedParam.getDataDate()));
-        lineParam.setEndTime(TimeUtils.getEndOfMonth(calculatedParam.getDataDate()));
-        List<String> lineIdList = calculatedParam.getIdList();
-        return getQualifiedDetails(calculatedParam, lineParam, lineIdList);
-    }
-
-    private List<QualifiedDetail> getQualifiedDetails(CalculatedParam calculatedParam, LineCountEvaluateParam lineParam, List<String> lineIdList) {
-        List<QualifiedDetail> info = new ArrayList<>();
         List<List<String>> pendingIds = ListUtils.partition(lineIdList, NUM);
         for (List<String> pendingId : pendingIds) {
             lineParam.setLineId(pendingId);
             List<DataLimitRateDto> data = dataLimitRateFeignClient.getRawData(lineParam).getData();
             Map<String, List<DataLimitRateDto>> limitRateMap = data.stream().collect(Collectors.groupingBy(DataLimitRateDto::getLineId));
             limitRateMap.forEach((key, value) -> {
-                QualifiedDetail qualified = new QualifiedDetail();
+                DataQualifiedDetail qualified = new DataQualifiedDetail();
                 qualified.setLineId(key);
                 qualified.setTime(calculatedParam.getDataDate());
                 int all = value.stream().mapToInt(DataLimitRateDto::getAllTime).sum();
@@ -309,7 +299,61 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
             });
         }
         if (CollUtil.isNotEmpty(info)) {
+            dataLimitQualifiedFeignClient.batchInsertion(info);
+        }
+    }
 
+    @Override
+    public List<DataQualifiedDetail> limitQualifiedMonthHandler(CalculatedParam calculatedParam) {
+        LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
+        lineParam.setStartTime(TimeUtils.getBeginOfMonth(calculatedParam.getDataDate()));
+        lineParam.setEndTime(TimeUtils.getEndOfMonth(calculatedParam.getDataDate()));
+        List<String> lineIdList = calculatedParam.getIdList();
+        return getDataQualifiedDetails(lineParam, lineIdList);
+    }
+
+    @Override
+    public List<DataQualifiedDetail> limitQualifiedQuarterHandler(CalculatedParam calculatedParam) {
+        LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
+        lineParam.setStartTime(TimeUtils.getBeginOfQuarter(calculatedParam.getDataDate()));
+        lineParam.setEndTime(TimeUtils.getEndOfQuarter(calculatedParam.getDataDate()));
+        List<String> lineIdList = calculatedParam.getIdList();
+        return getDataQualifiedDetails(lineParam, lineIdList);
+    }
+
+    @Override
+    public List<DataQualifiedDetail> limitQualifiedYearHandler(CalculatedParam calculatedParam) {
+        LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
+        lineParam.setStartTime(TimeUtils.getBeginOfYear(calculatedParam.getDataDate()));
+        lineParam.setEndTime(TimeUtils.getEndOfYear(calculatedParam.getDataDate()));
+        List<String> lineIdList = calculatedParam.getIdList();
+        return getDataQualifiedDetails(lineParam, lineIdList);
+    }
+
+    @NotNull
+    private List<DataQualifiedDetail> getDataQualifiedDetails(LineCountEvaluateParam lineParam, List<String> lineIdList) {
+        List<DataQualifiedDetail> info = new ArrayList<>();
+        List<List<String>> pendingIds = ListUtils.partition(lineIdList, NUM);
+        for (List<String> pendingId : pendingIds) {
+            lineParam.setLineId(pendingId);
+            List<DataQualifiedDetail> data = dataLimitQualifiedFeignClient.getRawData(lineParam).getData();
+            Map<String, List<DataQualifiedDetail>> limitRateMap = data.stream().collect(Collectors.groupingBy(DataQualifiedDetail::getLineId));
+            for (Map.Entry<String, List<DataQualifiedDetail>> entry : limitRateMap.entrySet()) {
+                String key = entry.getKey();
+                List<DataQualifiedDetail> value = entry.getValue();
+                DataQualifiedDetail qualified = new DataQualifiedDetail();
+                qualified.setLineId(key);
+                qualified.setTime(lineParam.getStartTime());
+                qualified.setFreqDevOvertime(PubUtils.doubleRound(2, value.stream().mapToDouble(DataQualifiedDetail::getFreqDevOvertime).average().getAsDouble()));
+                qualified.setVoltageDevOvertime(PubUtils.doubleRound(2, value.stream().mapToDouble(DataQualifiedDetail::getVoltageDevOvertime).average().getAsDouble()));
+                qualified.setUbalanceOvertime(PubUtils.doubleRound(2, value.stream().mapToDouble(DataQualifiedDetail::getUbalanceOvertime).average().getAsDouble()));
+                qualified.setUaberranceOvertime(PubUtils.doubleRound(2, value.stream().mapToDouble(DataQualifiedDetail::getUaberranceOvertime).average().getAsDouble()));
+                qualified.setINegOvertime(PubUtils.doubleRound(2, value.stream().mapToDouble(DataQualifiedDetail::getINegOvertime).average().getAsDouble()));
+                setOverTime(2, 25, "uharm", value, qualified);
+                setOverTime(2, 25, "iharm", value, qualified);
+                setOverTime(1, 16, "inuharm", value, qualified);
+                info.add(qualified);
+            }
         }
         return info;
     }
@@ -317,8 +361,31 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
     private double getaDouble(double value, int all) {
         return value * 100.0 / all;
     }
-
+    private void setOverTime(Integer start, Integer end, String targetName, List<DataQualifiedDetail> value, DataQualifiedDetail qualified) {
-    private void setOverTime(Integer start, Integer end, String targetName, List<DataLimitRateDto> value, QualifiedDetail qualified, int all) {
+        for (int i = start; i <= end; i++) {
+            // 构造方法名
+            String methodName = targetName + i + "Overtime";
+            try {
+                Field finalField = DataLimitRateDto.class.getDeclaredField(methodName);
+                finalField.setAccessible(true);
+                double v = PubUtils.doubleRound(2, value.stream().mapToDouble(temp -> {
+                    Double o;
+                    try {
+                        o = (Double) finalField.get(temp);
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                    return o.doubleValue();
+                }).average().getAsDouble());
+                Field declared = DataQualifiedDetail.class.getDeclaredField(methodName);
+                declared.setAccessible(true);
+                declared.set(qualified, v);
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+    private void setOverTime(Integer start, Integer end, String targetName, List<DataLimitRateDto> value, DataQualifiedDetail qualified, int all) {
         for (int i = start; i <= end; i++) {
             // 构造方法名
             String methodName = targetName + i + "Overtime";
@@ -334,7 +401,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
                     }
                     return o.intValue();
                 }).sum() * 100.0, all));
-                Field declared = QualifiedDetail.class.getDeclaredField(methodName);
+                Field declared = DataQualifiedDetail.class.getDeclaredField(methodName);
                 declared.setAccessible(true);
                 declared.set(qualified, v);
             } catch (NoSuchFieldException | IllegalAccessException e) {

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

@@ -33,4 +33,7 @@ public interface DataFlickerFeignClient {
 
     @PostMapping("/addList")
     HttpResult<String> addList(@RequestBody List<DataFlickerDto> data);
+
+    @PostMapping("/getColumnNameCountRawData")
+    HttpResult<Integer> getColumnNameCountRawData(@RequestBody LineCountEvaluateParam lineParam);
 }

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataLimitQualifiedFeignClient.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.DataLimitQualifiedFeignClientClientFallbackFactory;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/7 9:30
+ */
+@FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataLimitQualified", fallbackFactory = DataLimitQualifiedFeignClientClientFallbackFactory.class, contextId = "dataLimitQualified")
+public interface DataLimitQualifiedFeignClient {
+
+    @PostMapping("/batchInsertion")
+    HttpResult<String> batchInsertion(@RequestBody List<DataQualifiedDetail> dataIDTOList);
+
+    @PostMapping("/getRawData")
+    HttpResult<List<DataQualifiedDetail>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+}

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

@@ -39,6 +39,9 @@ public interface DataVFeignClient {
     @PostMapping("/getCountRawData")
     HttpResult<Integer> getCountRawData(@RequestBody LineCountEvaluateParam lineParam);
 
+    @PostMapping("/getColumnNameCountRawData")
+    HttpResult<Integer> getColumnNameCountRawData(@RequestBody LineCountEvaluateParam lineParam);
+
     //获取算法基础数据
     @PostMapping("/getBaseData")
     HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam);

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

@@ -65,6 +65,12 @@ public class DataFlickerFeignClientFallbackFactory implements FallbackFactory<Da
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<Integer> getColumnNameCountRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","闪变 时间分组获取条目数量",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -0,0 +1,55 @@
+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.DataLimitQualifiedFeignClient;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
+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/7 9:30
+ */
+@Slf4j
+@Component
+public class DataLimitQualifiedFeignClientClientFallbackFactory implements FallbackFactory<DataLimitQualifiedFeignClient> {
+
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     */
+    @Override
+    public DataLimitQualifiedFeignClient 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 DataLimitQualifiedFeignClient() {
+
+            @Override
+            public HttpResult<String> batchInsertion(List<DataQualifiedDetail> dataIDTOList) {
+                log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<DataQualifiedDetail>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -69,6 +69,12 @@ public class DataVFeignClientFallbackFactory implements FallbackFactory<DataVFei
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<Integer> getColumnNameCountRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","时间分组获取条目数量",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<List<CommonMinuteDto>> getBaseData(LineCountEvaluateParam lineParam) {
                 log.error("{}异常，降级处理，异常为：{}","获取算法基础数据",cause.toString());

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

@@ -8,6 +8,7 @@ import java.util.Map;
 
 /**
  * 监测点有效数值统计数据评估入参
+ *
  * @author hongawen
  * @version 1.0
  * @data 2024/11/6 20:36
@@ -41,4 +42,20 @@ public class LineCountEvaluateParam extends BaseParam implements Serializable {
      */
     private Map<String, List<String>> abnormalTime;
 
+    /**
+     * 列名
+     */
+    private String columnName;
+
+    /**
+     * 最小值 >=
+     */
+    private String ge;
+
+    /**
+     * 最大值 <=
+     */
+    private String lt;
+
+
 }

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

@@ -0,0 +1,79 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/18 13:54
+ */
+@Data
+public class DataComassesDPO implements Serializable {
+
+    private String time;
+
+    private String lineId;
+
+    private Double freqDev1;
+
+    private Double freqDev2;
+
+    private Double freqDev3;
+
+    private Double freqDev4;
+
+    private Double freqDev5;
+
+    private Double vuDev1;
+
+    private Double vuDev2;
+
+    private Double vuDev3;
+
+    private Double vuDev4;
+
+    private Double vuDev5;
+
+    private Double dataPst1;
+
+    private Double dataPst2;
+
+    private Double dataPst3;
+
+    private Double dataPst4;
+
+    private Double dataPst5;
+
+    private Double vUnbalance1;
+
+    private Double vUnbalance2;
+
+    private Double vUnbalance3;
+
+    private Double vUnbalance4;
+
+    private Double vUnbalance5;
+
+    private Double vThd1;
+
+    private Double vThd2;
+
+    private Double vThd3;
+
+    private Double vThd4;
+
+    private Double vThd5;
+
+    private Double event1;
+
+    private Double event2;
+
+    private Double event3;
+
+    private Double event4;
+
+    private Double event5;
+
+}

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @Date: 2025/3/12 19:16
  */
 @Data
-public class QualifiedDetail {
+public class DataQualifiedDetail {
 
     /**
      * 监测点ID合格率的变电站/装置/母线/线路序号

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

@@ -0,0 +1,120 @@
+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.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/3/27 15:20
+ */
+@Data
+@TableName(value = "r_stat_comasses_d")
+public class RStatComassesDPO implements Serializable {
+
+    @MppMultiId
+    @TableField(value = "time_id")
+    private String time;
+
+    @MppMultiId
+    @TableField(value = "line_id")
+    private String lineId;
+
+    @TableField(value = "freq_dev1")
+    private Double freqDev1;
+
+    @TableField(value = "freq_dev2")
+    private Double freqDev2;
+
+    @TableField(value = "freq_dev3")
+    private Double freqDev3;
+
+    @TableField(value = "freq_dev4")
+    private Double freqDev4;
+
+    @TableField(value = "freq_dev5")
+    private Double freqDev5;
+
+    @TableField(value = "vu_dev1")
+    private Double vuDev1;
+
+    @TableField(value = "vu_dev2")
+    private Double vuDev2;
+
+    @TableField(value = "vu_dev3")
+    private Double vuDev3;
+
+    @TableField(value = "vu_dev4")
+    private Double vuDev4;
+
+    @TableField(value = "vu_dev5")
+    private Double vuDev5;
+
+    @TableField(value = "data_plt1")
+    private Double dataPst1;
+
+    @TableField(value = "data_plt2")
+    private Double dataPst2;
+
+    @TableField(value = "data_plt3")
+    private Double dataPst3;
+
+    @TableField(value = "data_plt4")
+    private Double dataPst4;
+
+    @TableField(value = "data_plt5")
+    private Double dataPst5;
+
+    @TableField(value = "v_unbalance1")
+    private Double vUnbalance1;
+
+    @TableField(value = "v_unbalance2")
+    private Double vUnbalance2;
+
+    @TableField(value = "v_unbalance3")
+    private Double vUnbalance3;
+
+    @TableField(value = "v_unbalance4")
+    private Double vUnbalance4;
+
+    @TableField(value = "v_unbalance5")
+    private Double vUnbalance5;
+
+    @TableField(value = "v_thd1")
+    private Double vThd1;
+
+    @TableField(value = "v_thd2")
+    private Double vThd2;
+
+    @TableField(value = "v_thd3")
+    private Double vThd3;
+
+    @TableField(value = "v_thd4")
+    private Double vThd4;
+
+    @TableField(value = "v_thd5")
+    private Double vThd5;
+
+    @TableField(value = "event1")
+    private Double event1;
+
+    @TableField(value = "event2")
+    private Double event2;
+
+    @TableField(value = "event3")
+    private Double event3;
+
+    @TableField(value = "event4")
+    private Double event4;
+
+    @TableField(value = "event5")
+    private Double event5;
+
+}

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

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

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

@@ -66,6 +66,15 @@ public class DataFlickerController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getColumnNameCountRawData")
+    @ApiOperation("时间分组获取条目数量")
+    public HttpResult<Integer> getColumnNameCountRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getColumnNameCountRawData");
+        Integer data = dataFlickerQuery.getColumnNameCountRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
     @PostMapping("/getBaseData")
     @ApiOperation("获取算法基础数据")

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

@@ -0,0 +1,66 @@
+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.DataLimitRateDto;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
+import com.njcn.dataProcess.service.IDataLimitQualified;
+import com.njcn.dataProcess.service.IDataLimitRate;
+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("/dataLimitQualified")
+@Api(tags = "监测点稳态指标合格率获取")
+public class DataLimitQualifiedController extends BaseController {
+
+    @QueryBean
+    private IDataLimitQualified limitQualifiedQuery;
+
+    @InsertBean
+    private IDataLimitQualified limitQualifiedInsert;
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/batchInsertion")
+    @ApiOperation("批量插入")
+    public HttpResult<String> batchInsertion(@RequestBody List<DataQualifiedDetail> dataVDTOList) {
+        String methodDescribe = getMethodDescribe("batchInsertion");
+        limitQualifiedInsert.batchInsertion(dataVDTOList);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataQualifiedDetail>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataQualifiedDetail> rawData = limitQualifiedInsert.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
+    }
+}

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

@@ -96,7 +96,7 @@ public class DataVController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getCountRawData")
     @ApiOperation("获取总条目数量")
     public HttpResult<Integer> getCountRawData(@RequestBody LineCountEvaluateParam lineParam) {
@@ -105,7 +105,16 @@ public class DataVController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getColumnNameCountRawData")
+    @ApiOperation("时间分组获取条目数量")
+    public HttpResult<Integer> getColumnNameCountRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getColumnNameCountRawData");
+        Integer data = dataVQuery.getColumnNameCountRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getBaseData")
     @ApiOperation("获取算法基础数据")
     public HttpResult<List<CommonMinuteDto>> getBaseData(@RequestBody LineCountEvaluateParam lineParam) {

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

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

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataComAss.java

@@ -0,0 +1,25 @@
+package com.njcn.dataProcess.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.dataProcess.pojo.dto.DataComassesDPO;
+import com.njcn.dataProcess.pojo.po.RStatComassesDPO;
+
+import java.util.List;
+
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/6 10:22
+ */
+public interface IDataComAss extends IMppService<RStatComassesDPO> {
+
+    /**
+     * 批量插入数据
+     * @param limitQualifiedList
+     */
+    void batchInsertion(List<DataComassesDPO> limitQualifiedList);
+
+
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java

@@ -36,4 +36,11 @@ public interface IDataFlicker extends IMppService<RStatDataFlickerD> {
      * 批量插入数据
      */
     void addList(List<DataFlickerDto> dataIDtoList);
+
+    /**
+     * 时间分组获取条目数量
+     * @param lineParam
+     * @return
+     */
+    Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam);
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataLimitQualified.java

@@ -0,0 +1,32 @@
+package com.njcn.dataProcess.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
+import com.njcn.dataProcess.pojo.po.RStatLimitQualifiedD;
+import com.njcn.dataProcess.pojo.po.RStatLimitRateD;
+
+import java.util.List;
+
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/6 10:22
+ */
+public interface IDataLimitQualified extends IMppService<RStatLimitQualifiedD> {
+
+    /**
+     * 批量插入数据
+     * @param limitQualifiedList
+     */
+    void batchInsertion(List<DataQualifiedDetail> limitQualifiedList);
+
+
+    /**
+     * 获取原始数据
+     * @param lineParam
+     */
+    List<DataQualifiedDetail> getRawData(LineCountEvaluateParam lineParam);
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java

@@ -46,6 +46,13 @@ public interface IDataV extends IMppService<RStatDataVD> {
      */
     Integer getCountRawData(LineCountEvaluateParam lineParam);
 
+    /**
+     * 时间分组获取条目数量
+     * @param lineParam
+     * @return
+     */
+    Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam);
+
     /**
      * 获取监测点原始数据
      * @param lineParam 监测点参数

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java

@@ -1,12 +1,15 @@
 package com.njcn.dataProcess.service.impl.influxdb;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.imapper.DataFlickerMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataFlickerRelationMapper;
 import com.njcn.dataProcess.dto.DataFlickerDTO;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.po.influx.DataFlicker;
+import com.njcn.dataProcess.po.influx.DataV;
 import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
 import com.njcn.dataProcess.pojo.dto.DataFlickerDto;
 import com.njcn.dataProcess.pojo.po.RStatDataFlickerD;
@@ -122,6 +125,29 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
 
     }
 
+    @Override
+    public Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam) {
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFlicker.class);
+        influxQueryWrapper
+                .count(lineParam.getColumnName())
+                .regular(DataFlicker::getLineId, lineParam.getLineId())
+                .groupBy("time(1m) fill(none)")
+                .eq(DataFlicker::getQualityFlag, "0")
+                .between(DataFlicker::getTime, lineParam.getStartTime(), lineParam.getEndTime());
+
+        if (CollUtil.isNotEmpty(lineParam.getPhasicType())) {
+            influxQueryWrapper.regular(DataFlicker::getPhasicType, lineParam.getPhasicType());
+        }
+        if (ObjectUtil.isNotEmpty(lineParam.getGe())) {
+            influxQueryWrapper.ge(lineParam.getColumnName(), lineParam.getGe());
+        }
+        if (ObjectUtil.isNotEmpty(lineParam.getLt())) {
+            influxQueryWrapper.lt(lineParam.getColumnName(), lineParam.getLt());
+        }
+        List<DataFlicker> dataFlickers = dataFlickerMapper.selectByQueryWrapper(influxQueryWrapper);
+        return dataFlickers.size();
+    }
+
     /**
      * 按监测点集合、时间条件获取分钟数据
      * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitQualifiedImpl.java

@@ -0,0 +1,34 @@
+package com.njcn.dataProcess.service.impl.influxdb;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.dataProcess.dao.relation.mapper.RStatLimitQualifiedRelationMapper;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
+import com.njcn.dataProcess.pojo.po.RStatLimitQualifiedD;
+import com.njcn.dataProcess.service.IDataLimitQualified;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/7 10:13
+ */
+@Service("InfluxdbDataLimitQualifiedImpl")
+@RequiredArgsConstructor
+public class InfluxdbDataLimitQualifiedImpl extends MppServiceImpl<RStatLimitQualifiedRelationMapper, RStatLimitQualifiedD> implements IDataLimitQualified {
+
+
+    @Override
+    public void batchInsertion(List<DataQualifiedDetail> limitQualifiedList) {
+
+    }
+
+    @Override
+    public List<DataQualifiedDetail> getRawData(LineCountEvaluateParam lineParam) {
+        return Collections.emptyList();
+    }
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java

@@ -3,6 +3,7 @@ package com.njcn.dataProcess.service.impl.influxdb;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
 import com.njcn.dataProcess.constant.InfluxDBTableConstant;
@@ -49,6 +50,7 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
 
     /**
      * 注意：influxdb不推荐采用in函数的方式批量查询监测点的数据，效率很低，容易造成崩溃，故每次单测点查询
+     *
      * @param lineParam 监测点参数
      */
     @Override
@@ -90,8 +92,6 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
         }
 
 
-
-
         System.out.println("InfluxdbDataVImpl");
         return result;
     }
@@ -161,6 +161,7 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
                 .select(DataV::getVlDev)
                 .select(DataV::getVuDev)
                 .select(DataV::getQualityFlag)
+                .eq(DataV::getQualityFlag, "0")
                 .between(DataV::getTime, lineParam.getStartTime(), lineParam.getEndTime())
                 .limit(1)
         ;
@@ -168,6 +169,32 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
         return dataVS.size();
     }
 
+    @Override
+    public Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam) {
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
+        influxQueryWrapper
+                .count(lineParam.getColumnName())
+                .regular(DataV::getLineId, lineParam.getLineId())
+                .groupBy("time(1m) fill(none)")
+                .eq(DataV::getQualityFlag, "0")
+                .between(DataV::getTime, lineParam.getStartTime(), lineParam.getEndTime());
+
+        if (CollUtil.isNotEmpty(lineParam.getPhasicType())) {
+            influxQueryWrapper.regular(DataV::getPhasicType, lineParam.getPhasicType());
+        }
+        if (CollUtil.isNotEmpty(lineParam.getValueType())) {
+            influxQueryWrapper.regular(DataV::getValueType, lineParam.getValueType());
+        }
+        if (ObjectUtil.isNotEmpty(lineParam.getGe())) {
+            influxQueryWrapper.ge(lineParam.getColumnName(), lineParam.getGe());
+        }
+        if (ObjectUtil.isNotEmpty(lineParam.getLt())) {
+            influxQueryWrapper.lt(lineParam.getColumnName(), lineParam.getLt());
+        }
+        List<DataV> dataVS = dataVMapper.selectByQueryWrapper(influxQueryWrapper);
+        return dataVS.size();
+    }
+
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java

@@ -89,4 +89,9 @@ public class RelationDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
         });
         dataFlicker.saveOrUpdateBatchByMultiId(result);
     }
+
+    @Override
+    public Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam) {
+        return 0;
+    }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitQualifiedImpl.java

@@ -0,0 +1,56 @@
+package com.njcn.dataProcess.service.impl.relation;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.dataProcess.dao.relation.mapper.RStatLimitQualifiedRelationMapper;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
+import com.njcn.dataProcess.pojo.po.RStatLimitQualifiedD;
+import com.njcn.dataProcess.service.IDataLimitQualified;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/7 10:13
+ */
+@Service("RelationDataLimitQualifiedImpl")
+@RequiredArgsConstructor
+public class RelationDataLimitQualifiedImpl extends MppServiceImpl<RStatLimitQualifiedRelationMapper, RStatLimitQualifiedD> implements IDataLimitQualified {
+
+
+    @Override
+    public void batchInsertion(List<DataQualifiedDetail> limitQualifiedList) {
+        List<RStatLimitQualifiedD> result = new ArrayList<>();
+        limitQualifiedList.forEach(item->{
+            RStatLimitQualifiedD limitRate = new RStatLimitQualifiedD();
+            BeanUtils.copyProperties(item, limitRate);
+            result.add(limitRate);
+        });
+        this.saveOrUpdateBatchByMultiId(result);
+    }
+
+    @Override
+    public List<DataQualifiedDetail> getRawData(LineCountEvaluateParam lineParam) {
+        List<DataQualifiedDetail> result = new ArrayList<>();
+        LambdaQueryWrapper<RStatLimitQualifiedD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()),RStatLimitQualifiedD::getLineId,lineParam.getLineId())
+                .ge(RStatLimitQualifiedD::getTime,lineParam.getStartTime())
+                .le(RStatLimitQualifiedD::getTime,lineParam.getEndTime());
+        List<RStatLimitQualifiedD> list = this.list(lambdaQueryWrapper);
+
+        list.forEach(item->{
+            DataQualifiedDetail dto = new DataQualifiedDetail();
+            BeanUtils.copyProperties(item,dto);
+            result.add(dto);
+        });
+        return result;
+    }
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java

@@ -105,6 +105,13 @@ public class RelationDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
         return 0;
     }
 
+    @Override
+    public Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam) {
+        return 0;
+    }
+
+
+
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         return Collections.emptyList();

data-processing/data-processing-boot/src/main/resources/bootstrap.yml

@@ -56,7 +56,7 @@ data:
   source:
     query: Influxdb
 #    insert: Influxdb
-    insert: Influxdb
+    insert: Relation
 #mybatis配置信息
 mybatis-plus:
   configuration:

pom.xml

@@ -33,10 +33,10 @@
   <properties>
     <!--内网-->
     <middle.server.url>192.168.1.22</middle.server.url>
-    <service.server.url>192.168.1.130</service.server.url>
+    <service.server.url>192.168.1.121</service.server.url>
     <docker.server.url>192.168.1.22</docker.server.url>
     <nacos.url>${middle.server.url}:18848</nacos.url>
-    <nacos.namespace>c2cbedf1-14e9-42c8-98ec-4ffa96e68c0e</nacos.namespace>
+    <nacos.namespace>07ec981d-1377-4920-8760-b5a98ff7e668</nacos.namespace>
     <!--sentinel:port-->
     <sentinel.url>${middle.server.url}:8080</sentinel.url>
     <!--网关地址，主要用于配置swagger中认证token-->