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
2025-12-24 14:41:47 +08:00
parent 3f47b0f008
commit fdb4b7060a
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java
View File

@@ -92,6 +92,18 @@ public class PqScriptDtls implements Serializable {
@TableField("RetainTime") @TableField("RetainTime")
private Double retainTime; private Double retainTime;
/**
* 暂态前延时间（S）
*/
@TableField("FPreTime")
private Double fPreTime;
/**
* 暂态后延时间（S）
*/
@TableField("FAfterTime")
private Double fAfterTime;
/** /**
* 变动频度（次/min） * 变动频度（次/min）
*/ */

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

@@ -68,14 +68,14 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
private final static String INHARM_I = "InHarm_I"; private final static String INHARM_I = "InHarm_I";
private final static String DIP = "Dip"; private final static String DIP = "Dip";
private final static String FLICKER = "Flicker"; private final static String FLICKER = "Flicker";
@Value("${Dip.fPreTime}") // @Value("${Dip.fPreTime}")
private Double fPreTime; // private Double fPreTime;
@Value("${Dip.fRampIn}") @Value("${Dip.fRampIn}")
private Double fRampIn; private Double fRampIn;
@Value("${Dip.fRampOut}") @Value("${Dip.fRampOut}")
private Double fRampOut; private Double fRampOut;
@Value("${Dip.fAfterTime}") // @Value("${Dip.fAfterTime}")
private Double fAfterTime; // private Double fAfterTime;
@Value("${Flicker.waveFluType}") @Value("${Flicker.waveFluType}")
private String waveFluType; private String waveFluType;
@Value("${Flicker.waveType}") @Value("${Flicker.waveType}")
@@ -385,6 +385,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
dip.setPhase(phase); dip.setPhase(phase);
dip.setTransValue(dipData.getFTransValue()); dip.setTransValue(dipData.getFTransValue());
dip.setRetainTime(dipData.getRetainTime()); dip.setRetainTime(dipData.getRetainTime());
dip.setFPreTime(dipData.getFPreTime());
dip.setFAfterTime(dipData.getFAfterTime());
info.add(dip); info.add(dip);
} }
} }
@@ -1054,10 +1056,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
dipDataDTO.setFTransValue(0.0); dipDataDTO.setFTransValue(0.0);
dipDataDTO.setFRetainTime(0.0); dipDataDTO.setFRetainTime(0.0);
dipDataDTO.setFPreTime(fPreTime); // dipDataDTO.setFPreTime(fPreTime);
dipDataDTO.setFRampIn(fRampIn); dipDataDTO.setFRampIn(fRampIn);
dipDataDTO.setFRampOut(fRampOut); dipDataDTO.setFRampOut(fRampOut);
dipDataDTO.setFAfterTime(fAfterTime); // dipDataDTO.setFAfterTime(fAfterTime);
channelListDTO.setDipData(dipDataDTO); channelListDTO.setDipData(dipDataDTO);
@@ -1104,6 +1106,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
if (CollUtil.isNotEmpty(dipList)) { if (CollUtil.isNotEmpty(dipList)) {
PqScriptDtls dip = dipList.get(0); PqScriptDtls dip = dipList.get(0);
dipDataDTO.setFTransValue(dip.getTransValue()); dipDataDTO.setFTransValue(dip.getTransValue());
dipDataDTO.setFPreTime(dip.getFPreTime());
dipDataDTO.setFAfterTime(dip.getFAfterTime());
if (devFly) { if (devFly) {
// if (isValueType) { // if (isValueType) {
dipDataDTO.setFTransValue(dip.getTransValue()); dipDataDTO.setFTransValue(dip.getTransValue());