ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2026-05-27 11:20:44 +08:00
parent 3cb4a46a16
commit 49ca27d994
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
View File

@@ -446,7 +446,9 @@ public class DetectionServiceImpl {
fData = sourceIssue.getFFreq(); fData = sourceIssue.getFFreq();
} }
if (P.equals(type)) { if (P.equals(type)) {
fData = sourceIssue.getFUn() * sourceIssue.getFIn(); fData = sourceIssue.getFUn() * sourceIssue.getFIn() * 0.01;
Double finalFData = fData;
errDtlsCheckData.stream().forEach(x -> x.setValue(x.getValue() * finalFData));
} }
SimAndDigNonHarmonicResult result = new SimAndDigNonHarmonicResult(); SimAndDigNonHarmonicResult result = new SimAndDigNonHarmonicResult();
String[] split = dev.get(0).getId().split("_"); String[] split = dev.get(0).getId().split("_");

14
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
View File

@@ -424,7 +424,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
@Override @Override
public List<PqScriptDtlsParam.CheckData> scriptDtlsCheckDataList(PqScriptDtlsParam sourceIssue) { public List<PqScriptDtlsParam.CheckData> scriptDtlsCheckDataList(PqScriptDtlsParam sourceIssue) {
Boolean valueType = pqScriptMapper.selectScriptIsValueType(sourceIssue.getScriptId()); // Boolean valueType = pqScriptMapper.selectScriptIsValueType(sourceIssue.getScriptId());
List<PqScriptDtlsParam.CheckData> info = new ArrayList<>(); List<PqScriptDtlsParam.CheckData> info = new ArrayList<>();
//获取所有下拉值情况 //获取所有下拉值情况
@@ -632,9 +632,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setEnable(channelListDTO.getEnable()); checkData.setEnable(channelListDTO.getEnable());
//电压*电流*cos（电压角度-电流角度） //电压*电流*cos（电压角度-电流角度）
checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000 * Math.cos((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180)); checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 100 * Math.cos((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
// if (valueType) { // if (valueType) {
checkData.setValue(checkData.getValue() * 57.74 * 5); // checkData.setValue(checkData.getValue() * 57.74 * 5);
// } // }
setCheck(info, checkData, channelListDTO, checkArchive, listDTO); setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
} }
@@ -655,9 +655,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setEnable(channelListDTO.getEnable()); checkData.setEnable(channelListDTO.getEnable());
//电压*电流*cos（电压角度-电流角度） //电压*电流*cos（电压角度-电流角度）
checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000 * Math.sin((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180)); checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 100 * Math.sin((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
// if (valueType) { // if (valueType) {
checkData.setValue(checkData.getValue() * 57.74 * 5); // checkData.setValue(checkData.getValue() * 57.74 * 5);
// } // }
setCheck(info, checkData, channelListDTO, checkArchive, listDTO); setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
} }
@@ -678,9 +678,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setEnable(channelListDTO.getEnable()); checkData.setEnable(channelListDTO.getEnable());
//电压*电流*cos（电压角度-电流角度） //电压*电流*cos（电压角度-电流角度）
checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000); checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 100);
// if (valueType) { // if (valueType) {
checkData.setValue(checkData.getValue() * 57.74 * 5); // checkData.setValue(checkData.getValue() * 57.74 * 5);
// } // }
setCheck(info, checkData, channelListDTO, checkArchive, listDTO); setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
} }