Middleware/cn-data-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

算法调整

Browse Source
This commit is contained in:
xy
2026-01-07 18:52:03 +08:00
parent 91ff704f0a
commit dbf0027c65
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java
View File

@@ -15,6 +15,7 @@ public interface IDataLimitRateAsync {
* @param overLimitMap * @param overLimitMap
* @param size * @param size
* @param i * @param i
* @param type 系统类型
* @Author: wr * @Author: wr
* @Date: 2025/12/17 12:16 * @Date: 2025/12/17 12:16
*/ */
@@ -23,5 +24,6 @@ public interface IDataLimitRateAsync {
List<String> phase, List<String> phase,
Map<String, Overlimit> overLimitMap, Map<String, Overlimit> overLimitMap,
int size, int size,
int i); int i,
int type);
} }

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

@@ -111,7 +111,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
for (int i = 0; i < pendingIds.size(); i++) { for (int i = 0; i < pendingIds.size(); i++) {
logger.info(calculatedParam.getDataDate()+" 总分区数据：" + pendingIds.size() + "=====》当前第"+(i + 1)+"小分区"); logger.info(calculatedParam.getDataDate()+" 总分区数据：" + pendingIds.size() + "=====》当前第"+(i + 1)+"小分区");
List<String> list = pendingIds.get(i); List<String> list = pendingIds.get(i);
dataLimitRateAsync.lineDataRate(calculatedParam.getDataDate(), list, phase, overLimitMap, pendingIds.size(), (i + 1)); dataLimitRateAsync.lineDataRate(calculatedParam.getDataDate(), list, phase, overLimitMap, pendingIds.size(), (i + 1), lineParam.getType());
} }
System.gc(); System.gc();
} }

19
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java
View File

@@ -64,12 +64,14 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
List<String> phase, List<String> phase,
Map<String, Overlimit> overLimitMap, Map<String, Overlimit> overLimitMap,
int size, int size,
int i) { int i,
int type) {
List<DataLimitDetailDto> result = new ArrayList<>(); List<DataLimitDetailDto> result = new ArrayList<>();
LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
lineParam.setStartTime(TimeUtils.getBeginOfDay(dataDate)); lineParam.setStartTime(TimeUtils.getBeginOfDay(dataDate));
lineParam.setEndTime(TimeUtils.getEndOfDay(dataDate)); lineParam.setEndTime(TimeUtils.getEndOfDay(dataDate));
lineParam.setLineId(list); lineParam.setLineId(list);
lineParam.setType(type);
//获取电压数据 //获取电压数据
List<DataVDto> dataVAllTime = dataVFeignClient.getRawData(lineParam).getData(); List<DataVDto> dataVAllTime = dataVFeignClient.getRawData(lineParam).getData();
//闪变数据 //闪变数据
@@ -94,10 +96,17 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
* 闪变总计算次数(用data_plt中phasic_type=A,value_type=avg,quality_flag=0来参与统计) * 闪变总计算次数(用data_plt中phasic_type=A,value_type=avg,quality_flag=0来参与统计)
*/ */
//fixme 冀北现场 闪变原始表没有 value_type 这个参数 //fixme 冀北现场 闪变原始表没有 value_type 这个参数
Map<String, List<DataPltDto>> pltAllTime = dataPltAllTime.stream() Map<String, List<DataPltDto>> pltAllTime;
.filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType())) if (type == 2) {
// .filter(x -> InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(x.getValueType())) pltAllTime = dataPltAllTime.stream()
.collect(Collectors.groupingBy(DataPltDto::getLineId)); .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType()))
.filter(x -> InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(x.getValueType()))
.collect(Collectors.groupingBy(DataPltDto::getLineId));
} else {
pltAllTime = dataPltAllTime.stream()
.filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType()))
.collect(Collectors.groupingBy(DataPltDto::getLineId));
}
/** /**
*功能描述:获取influxDB -> data_harmrate_v -> *功能描述:获取influxDB -> data_harmrate_v ->