闪变调整

This commit is contained in:
caozehui
2026-06-26 13:56:46 +08:00
parent 6f8acd3fb5
commit 597f70edd1

View File

@@ -77,8 +77,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
private Double fRampOut; private Double fRampOut;
// @Value("${Dip.fAfterTime}") // @Value("${Dip.fAfterTime}")
// private Double fAfterTime; // private Double fAfterTime;
private static final String waveFluType = "SQU"; private static final String waveFluType = "CPM";
private static final String waveType = "CPM"; private static final String waveType = "SQU";
private static final Double fDutyCycle = 50.0; private static final Double fDutyCycle = 50.0;
@@ -398,7 +398,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
PqScriptDtls dip = setScriptDtls(sourceIssue, i); PqScriptDtls dip = setScriptDtls(sourceIssue, i);
dip.setValueType(FLICKER); dip.setValueType(FLICKER);
dip.setPhase(phase); dip.setPhase(phase);
if (!"CPM".equals(flickerData.getWaveType())) { if (!"CPM".equals(flickerData.getWaveFluType())) {
dip.setChagFre(NumberUtil.round(flickerData.getFChagFre() * 120, -1).doubleValue()); dip.setChagFre(NumberUtil.round(flickerData.getFChagFre() * 120, -1).doubleValue());
} else { } else {
dip.setChagFre(flickerData.getFChagFre()); dip.setChagFre(flickerData.getFChagFre());