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

1.pms微调

Browse Source
This commit is contained in:
雨木c
2024-01-05 18:44:01 +08:00
parent e67ade979a
commit 6e799fc1a4
2 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java
View File

@@ -335,79 +335,79 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
Overlimit overlimit = map.get(monitor.getId());
monitorLimitDTO.setVoldelimiteUp(BigDecimal.valueOf(monitor.getVoltageDeviationUpperLimit()));
monitorLimitDTO.setVoldelimiteLow(BigDecimal.valueOf(monitor.getVoltageDeviationLowerLimit()));
monitorLimitDTO.setVoldelimiteUp(BigDecimal.valueOf(monitor.getVoltageDeviationUpperLimit()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setVoldelimiteLow(BigDecimal.valueOf(monitor.getVoltageDeviationLowerLimit()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setPltLimit(BigDecimal.valueOf(overlimit.getFlicker()));
monitorLimitDTO.setRatedeLimiteUp(BigDecimal.valueOf(overlimit.getFreqDev()));
monitorLimitDTO.setRatedeLimiteDown(BigDecimal.valueOf(-overlimit.getFreqDev()));
monitorLimitDTO.setPltLimit(BigDecimal.valueOf(overlimit.getFlicker()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setRatedeLimiteUp(BigDecimal.valueOf(overlimit.getFreqDev()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setRatedeLimiteDown(BigDecimal.valueOf(-overlimit.getFreqDev()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setVthdLimit(BigDecimal.valueOf(overlimit.getUaberrance()));
monitorLimitDTO.setFlucLimit(BigDecimal.valueOf(overlimit.getVoltageFluctuation()));
monitorLimitDTO.setDeltaLimit(BigDecimal.valueOf(overlimit.getVoltageDev()));
monitorLimitDTO.setVthdLimit(BigDecimal.valueOf(overlimit.getUaberrance()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setFlucLimit(BigDecimal.valueOf(overlimit.getVoltageFluctuation()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setDeltaLimit(BigDecimal.valueOf(overlimit.getVoltageDev()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setVunbanLimit(BigDecimal.valueOf(overlimit.getUbalance()));
monitorLimitDTO.setOddHamVPerate(BigDecimal.valueOf(overlimit.getUharm3()));
monitorLimitDTO.setEveHamVPerate(BigDecimal.valueOf(overlimit.getUharm2()));
monitorLimitDTO.setVunbanLimit(BigDecimal.valueOf(overlimit.getUbalance()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setOddHamVPerate(BigDecimal.valueOf(overlimit.getUharm3()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setEveHamVPerate(BigDecimal.valueOf(overlimit.getUharm2()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI2Limit(BigDecimal.valueOf(overlimit.getIharm2()));
monitorLimitDTO.setI3Limit(BigDecimal.valueOf(overlimit.getIharm3()));
monitorLimitDTO.setI4Limit(BigDecimal.valueOf(overlimit.getIharm4()));
monitorLimitDTO.setI5Limit(BigDecimal.valueOf(overlimit.getIharm5()));
monitorLimitDTO.setI6Limit(BigDecimal.valueOf(overlimit.getIharm6()));
monitorLimitDTO.setI7Limit(BigDecimal.valueOf(overlimit.getIharm7()));
monitorLimitDTO.setI8Limit(BigDecimal.valueOf(overlimit.getIharm8()));
monitorLimitDTO.setI9Limit(BigDecimal.valueOf(overlimit.getIharm9()));
monitorLimitDTO.setI10Limit(BigDecimal.valueOf(overlimit.getIharm10()));
monitorLimitDTO.setI11Limit(BigDecimal.valueOf(overlimit.getIharm11()));
monitorLimitDTO.setI2Limit(BigDecimal.valueOf(overlimit.getIharm2()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI3Limit(BigDecimal.valueOf(overlimit.getIharm3()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI4Limit(BigDecimal.valueOf(overlimit.getIharm4()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI5Limit(BigDecimal.valueOf(overlimit.getIharm5()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI6Limit(BigDecimal.valueOf(overlimit.getIharm6()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI7Limit(BigDecimal.valueOf(overlimit.getIharm7()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI8Limit(BigDecimal.valueOf(overlimit.getIharm8()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI9Limit(BigDecimal.valueOf(overlimit.getIharm9()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI10Limit(BigDecimal.valueOf(overlimit.getIharm10()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI11Limit(BigDecimal.valueOf(overlimit.getIharm11()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI12Limit(BigDecimal.valueOf(overlimit.getIharm12()));
monitorLimitDTO.setI13Limit(BigDecimal.valueOf(overlimit.getIharm13()));
monitorLimitDTO.setI14Limit(BigDecimal.valueOf(overlimit.getIharm14()));
monitorLimitDTO.setI15Limit(BigDecimal.valueOf(overlimit.getIharm15()));
monitorLimitDTO.setI16Limit(BigDecimal.valueOf(overlimit.getIharm16()));
monitorLimitDTO.setI17Limit(BigDecimal.valueOf(overlimit.getIharm17()));
monitorLimitDTO.setI18Limit(BigDecimal.valueOf(overlimit.getIharm18()));
monitorLimitDTO.setI19Limit(BigDecimal.valueOf(overlimit.getIharm19()));
monitorLimitDTO.setI20Limit(BigDecimal.valueOf(overlimit.getIharm20()));
monitorLimitDTO.setI21Limit(BigDecimal.valueOf(overlimit.getIharm21()));
monitorLimitDTO.setI12Limit(BigDecimal.valueOf(overlimit.getIharm12()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI13Limit(BigDecimal.valueOf(overlimit.getIharm13()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI14Limit(BigDecimal.valueOf(overlimit.getIharm14()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI15Limit(BigDecimal.valueOf(overlimit.getIharm15()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI16Limit(BigDecimal.valueOf(overlimit.getIharm16()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI17Limit(BigDecimal.valueOf(overlimit.getIharm17()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI18Limit(BigDecimal.valueOf(overlimit.getIharm18()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI19Limit(BigDecimal.valueOf(overlimit.getIharm19()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI20Limit(BigDecimal.valueOf(overlimit.getIharm20()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI21Limit(BigDecimal.valueOf(overlimit.getIharm21()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI22Limit(BigDecimal.valueOf(overlimit.getIharm22()));
monitorLimitDTO.setI23Limit(BigDecimal.valueOf(overlimit.getIharm23()));
monitorLimitDTO.setI24Limit(BigDecimal.valueOf(overlimit.getIharm24()));
monitorLimitDTO.setI25Limit(BigDecimal.valueOf(overlimit.getIharm25()));
monitorLimitDTO.setI26Limit(BigDecimal.valueOf(overlimit.getIharm26()));
monitorLimitDTO.setI27Limit(BigDecimal.valueOf(overlimit.getIharm27()));
monitorLimitDTO.setI28Limit(BigDecimal.valueOf(overlimit.getIharm28()));
monitorLimitDTO.setI29Limit(BigDecimal.valueOf(overlimit.getIharm29()));
monitorLimitDTO.setI30Limit(BigDecimal.valueOf(overlimit.getIharm30()));
monitorLimitDTO.setI31Limit(BigDecimal.valueOf(overlimit.getIharm31()));
monitorLimitDTO.setI22Limit(BigDecimal.valueOf(overlimit.getIharm22()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI23Limit(BigDecimal.valueOf(overlimit.getIharm23()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI24Limit(BigDecimal.valueOf(overlimit.getIharm24()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI25Limit(BigDecimal.valueOf(overlimit.getIharm25()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI26Limit(BigDecimal.valueOf(overlimit.getIharm26()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI27Limit(BigDecimal.valueOf(overlimit.getIharm27()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI28Limit(BigDecimal.valueOf(overlimit.getIharm28()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI29Limit(BigDecimal.valueOf(overlimit.getIharm29()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI30Limit(BigDecimal.valueOf(overlimit.getIharm30()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI31Limit(BigDecimal.valueOf(overlimit.getIharm31()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI32Limit(BigDecimal.valueOf(overlimit.getIharm32()));
monitorLimitDTO.setI33Limit(BigDecimal.valueOf(overlimit.getIharm33()));
monitorLimitDTO.setI34Limit(BigDecimal.valueOf(overlimit.getIharm34()));
monitorLimitDTO.setI35Limit(BigDecimal.valueOf(overlimit.getIharm35()));
monitorLimitDTO.setI36Limit(BigDecimal.valueOf(overlimit.getIharm36()));
monitorLimitDTO.setI37Limit(BigDecimal.valueOf(overlimit.getIharm37()));
monitorLimitDTO.setI38Limit(BigDecimal.valueOf(overlimit.getIharm38()));
monitorLimitDTO.setI39Limit(BigDecimal.valueOf(overlimit.getIharm39()));
monitorLimitDTO.setI40Limit(BigDecimal.valueOf(overlimit.getIharm40()));
monitorLimitDTO.setI41Limit(BigDecimal.valueOf(overlimit.getIharm41()));
monitorLimitDTO.setI32Limit(BigDecimal.valueOf(overlimit.getIharm32()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI33Limit(BigDecimal.valueOf(overlimit.getIharm33()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI34Limit(BigDecimal.valueOf(overlimit.getIharm34()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI35Limit(BigDecimal.valueOf(overlimit.getIharm35()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI36Limit(BigDecimal.valueOf(overlimit.getIharm36()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI37Limit(BigDecimal.valueOf(overlimit.getIharm37()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI38Limit(BigDecimal.valueOf(overlimit.getIharm38()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI39Limit(BigDecimal.valueOf(overlimit.getIharm39()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI40Limit(BigDecimal.valueOf(overlimit.getIharm40()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI41Limit(BigDecimal.valueOf(overlimit.getIharm41()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI42Limit(BigDecimal.valueOf(overlimit.getIharm42()));
monitorLimitDTO.setI43Limit(BigDecimal.valueOf(overlimit.getIharm43()));
monitorLimitDTO.setI44Limit(BigDecimal.valueOf(overlimit.getIharm44()));
monitorLimitDTO.setI45Limit(BigDecimal.valueOf(overlimit.getIharm45()));
monitorLimitDTO.setI46Limit(BigDecimal.valueOf(overlimit.getIharm46()));
monitorLimitDTO.setI47Limit(BigDecimal.valueOf(overlimit.getIharm47()));
monitorLimitDTO.setI48Limit(BigDecimal.valueOf(overlimit.getIharm48()));
monitorLimitDTO.setI49Limit(BigDecimal.valueOf(overlimit.getIharm49()));
monitorLimitDTO.setI50Limit(BigDecimal.valueOf(overlimit.getIharm50()));
monitorLimitDTO.setI42Limit(BigDecimal.valueOf(overlimit.getIharm42()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI43Limit(BigDecimal.valueOf(overlimit.getIharm43()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI44Limit(BigDecimal.valueOf(overlimit.getIharm44()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI45Limit(BigDecimal.valueOf(overlimit.getIharm45()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI46Limit(BigDecimal.valueOf(overlimit.getIharm46()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI47Limit(BigDecimal.valueOf(overlimit.getIharm47()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI48Limit(BigDecimal.valueOf(overlimit.getIharm48()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI49Limit(BigDecimal.valueOf(overlimit.getIharm49()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setI50Limit(BigDecimal.valueOf(overlimit.getIharm50()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setHarmonicVoltageLimit2(BigDecimal.valueOf(overlimit.getInuharm1()));
monitorLimitDTO.setHarmonicVoltageLimit3to16(BigDecimal.valueOf(overlimit.getInuharm3()));
monitorLimitDTO.setHarmonicVoltageLimit2(BigDecimal.valueOf(overlimit.getInuharm1()).setScale(3, RoundingMode.HALF_UP));
monitorLimitDTO.setHarmonicVoltageLimit3to16(BigDecimal.valueOf(overlimit.getInuharm3()).setScale(3, RoundingMode.HALF_UP));
pushResult.add(monitorLimitDTO);

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java
View File

@@ -90,7 +90,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
RUploadEvaluationDataD dto = getLineNum(allDept,item2.getVoltageType(),item.getUnitId());
if (dto.getMonitorBusNum() !=0 ){
RUploadEvaluationDataD rUploadEvaluationDataD = new RUploadEvaluationDataD();
rUploadEvaluationDataD.setId(IdUtil.simpleUUID());
//rUploadEvaluationDataD.setId(IdUtil.simpleUUID());
rUploadEvaluationDataD.setProvinceId(dept.getCode());
rUploadEvaluationDataD.setProvinceName(dept.getName());
rUploadEvaluationDataD.setDataSources(UploadEnum.DATA_SOURCES_01.getCode());
@@ -129,6 +129,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
}
});
if (CollectionUtil.isNotEmpty(result)){
result.forEach(item->item.setId(IdUtil.simpleUUID()));
this.saveOrUpdateBatchByMultiId(result,1000);
}
}