Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改算法

Browse Source
This commit is contained in:
hzj
2025-02-07 10:13:26 +08:00
parent 169b701fa9
commit 6a1bd88ab8
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java
View File

@@ -36,6 +36,7 @@ import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -293,11 +294,11 @@ public class RStatOrgServiceImpl implements RStatOrgService {
between("data_date",begin,end); between("data_date",begin,end);
RMpPassRateMPO rMpPassRateMPO = rMpPassRateMMapper.selectOne(rMpPassRateMPOQueryWrapper); RMpPassRateMPO rMpPassRateMPO = rMpPassRateMMapper.selectOne(rMpPassRateMPOQueryWrapper);
//todo 这边有点问题,每日监测点信息从公共接口获取，当日监测点应该都一样，不存在表数据不一致的情况 //todo 这边有点问题,每日监测点信息从公共接口获取，当日监测点应该都一样，不存在表数据不一致的情况
// if (!Objects.isNull(rMpPassRateMPO)){ if (!Objects.isNull(rMpPassRateMPO)){
rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate()); rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate());
rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate()); rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate());
rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getVDevPassRate()); rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getVDevPassRate());
// } }
/*11、日均监测到暂态指标的监测点数*/ /*11、日均监测到暂态指标的监测点数*/
rMpEventDetailDPOQueryWrapper.clear(); rMpEventDetailDPOQueryWrapper.clear();

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
View File

@@ -104,7 +104,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
* @Description: 3、频率在【45，55】之间； * @Description: 3、频率在【45，55】之间；
* 4、相电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级/1.732 * 4、相电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级/1.732
* 5、线电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级 * 5、线电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级
* 6、电压总谐波畸变率在【0.1%，20%】之间； * 6、电压总谐波畸变率在【0%，20%】之间；
* 7、负序电压不平衡度在【0，20%】。满足以上条件则是一条有效数据 * 7、负序电压不平衡度在【0，20%】。满足以上条件则是一条有效数据
* @Param: [fiveItems, pmsAbnormalRules, voltage] * @Param: [fiveItems, pmsAbnormalRules, voltage]
* @return: java.lang.Integer * @return: java.lang.Integer

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
View File

@@ -93,7 +93,7 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf( rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf(
(Double.valueOf(rMpMonitorEvaluateD.getFreqCount ()+ rMpMonitorEvaluateD.getLineVoltageCount ()+ (Double.valueOf(rMpMonitorEvaluateD.getFreqCount ()+ rMpMonitorEvaluateD.getLineVoltageCount ()+
rMpMonitorEvaluateD.getPhaseVoltageCount ()+ rMpMonitorEvaluateD.getUnbalanceCount ()+ rMpMonitorEvaluateD.getPhaseVoltageCount ()+ rMpMonitorEvaluateD.getUnbalanceCount ()+
rMpMonitorEvaluateD.getVThdCount ()))/(5* rMpMonitorEvaluateD.getEffectiveMinuteCount ()) rMpMonitorEvaluateD.getVThdCount ()))*statisticalInterval/(5*1440)
).setScale(5, BigDecimal.ROUND_HALF_UP)); ).setScale(5, BigDecimal.ROUND_HALF_UP));
} }

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorService.java
View File

@@ -20,7 +20,7 @@ public interface ROperatingMonitorService extends IMppService<ROperatingMonitorD
* @Description: 采用以下公式计算数据完整率： * @Description: 采用以下公式计算数据完整率：
* 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100% * 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100%
* 采用以下公式计算数据准确率 * 采用以下公式计算数据准确率
* 〖数据准确率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(有效值数据个数*5)*100% * 〖数据准确率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(有效值数据个数*5)*100%（有效值数据个数修改为1440/interval)
* 采用以下公式计算指标完整率 * 采用以下公式计算指标完整率
* 〖指标完整率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(1440/interval*5)*100% 采用以下公式计算数据完整率： * 〖指标完整率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(1440/interval*5)*100% 采用以下公式计算数据完整率：
* 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100% * 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100%