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:23:38 +08:00
parent 4c239b1604
commit 91ff704f0a
7 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java
View File

@@ -299,6 +299,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
CsLinePO po = lineMap.get(lineId);
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class);
influxQueryWrapper.samePrefixAndSuffix("Pq_HarmP_", "p_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
influxQueryWrapper.samePrefixAndSuffix("Pq_HarmP_", "p_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
influxQueryWrapper.eq(DataHarmpowerP::getLineId, lineId)
.eq(DataHarmpowerP::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
.select(DataHarmpowerP::getLineId)
@@ -308,8 +309,8 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
.select("Pq_DF","df")
//视在功率因素
.select("Pq_PF","pf")
//总功功率
.select("Pq_P","p")
//三相总功功率
.select("Pq_TotP","p")
//基波有功功率
.select("Pq_FundP","p_1")
.between(DataHarmpowerP::getTime, startTime, endTime)

6
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java
View File

@@ -296,9 +296,9 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
.select(DataHarmpowerQ::getLineId)
.select(DataHarmpowerQ::getPhasicType)
.select(DataHarmpowerQ::getValueType)
//总功功率
.select("Pq_Q","q")
//基波有功功率
//三相总无功功率
.select("Pq_TotQ","q")
//基波无功功率
.select("Pq_FundQ","q_1")
.between(DataHarmpowerQ::getTime, startTime, endTime)
.eq(DataHarmpowerQ::getQualityFlag, "0");

6
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java
View File

@@ -296,9 +296,9 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
.select(DataHarmpowerS::getLineId)
.select(DataHarmpowerS::getPhasicType)
.select(DataHarmpowerS::getValueType)
//总功功率
.select("Pq_S","s")
//基波有功功率
//三相总视在功率
.select("Pq_TotS","s")
//基波视在功率
.select("Pq_FundS","s_1")
.between(DataHarmpowerS::getTime, startTime, endTime)
.eq(DataHarmpowerS::getQualityFlag, "0");

2
data-processing/data-processing-boot/src/main/resources/bootstrap.yml
View File

@@ -50,7 +50,7 @@ spring:
logging:
config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
level:
root: info
root: error
mqtt: