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-04-22 20:39:53 +08:00
parent f20e2c9b32
commit e020aa466e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterDevService.java
View File

@@ -300,7 +300,7 @@ public class SocketFreqConverterDevService {
} }
List<FreqConverterStatus> statusList = freqConverterService.getDipDurationStatusData(suffix, lastStatusData.getTimestamp(), pqDipData.getStartTime().plusNanos(pqDipData.getDurationMs() * 1000_000L)); List<FreqConverterStatus> statusList = freqConverterService.getDipDurationStatusData(suffix, lastStatusData.getTimestamp(), pqDipData.getStartTime().plusNanos(pqDipData.getDurationMs() * 1000_000L));
Integer originalTolerant = (lastStatusData.getStatusWord1() != freqConverterConfig.getNoTolerant()) ? 1 : 0; Integer originalTolerant = (lastStatusData.getStatusWord1() == freqConverterConfig.getTolerant()) ? 1 : 0;
LocalDateTime targetEndTime = pqDipData.getStartTime() LocalDateTime targetEndTime = pqDipData.getStartTime()
.plusNanos(pqDipData.getDurationMs() * 1000_000L) .plusNanos(pqDipData.getDurationMs() * 1000_000L)
.plusNanos(freqConverterConfig.getDt() * 1000_000L); .plusNanos(freqConverterConfig.getDt() * 1000_000L);
@@ -310,7 +310,7 @@ public class SocketFreqConverterDevService {
PqFreqConverterTestRes testRes = new PqFreqConverterTestRes(); PqFreqConverterTestRes testRes = new PqFreqConverterTestRes();
testRes.setDipId(pqDipData.getId()); testRes.setDipId(pqDipData.getId());
testRes.setTolerant(originalTolerant == 1 ? testRes.setTolerant(originalTolerant == 1 ?
(status.getStatusWord1() != freqConverterConfig.getNoTolerant() ? 1 : 0) (status.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0)
: 0); : 0);
testRes.setStartTime(lastStatusData.getTimestamp()); testRes.setStartTime(lastStatusData.getTimestamp());

2
detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
View File

@@ -299,7 +299,7 @@ public class SocketFreqConverterService {
? freqConverterStatus.getTimestamp() ? freqConverterStatus.getTimestamp()
: task.getTargetEndTime()); : task.getTargetEndTime());
testRes.setTolerant(testRes.getTolerant() & (freqConverterStatus.getStatusWord1() != freqConverterConfig.getNoTolerant() ? 1 : 0)); testRes.setTolerant(testRes.getTolerant() & (freqConverterStatus.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0));
testResList.add(testRes); testResList.add(testRes);
if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) { if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) {

2
detection/src/main/java/com/njcn/gather/freqConverter/config/FreqConverterConfig.java
View File

@@ -13,6 +13,6 @@ import org.springframework.stereotype.Component;
@ConfigurationProperties(prefix = "freq-converter") @ConfigurationProperties(prefix = "freq-converter")
public class FreqConverterConfig { public class FreqConverterConfig {
private Long schedulePeriod; private Long schedulePeriod;
private Integer noTolerant; private Integer tolerant;
private Integer dt; private Integer dt;
} }

2
entrance/src/main/resources/application.yml
View File

@@ -129,5 +129,5 @@ activate:
freq-converter: freq-converter:
schedule-period: 200 #定时器运行间隔 schedule-period: 200 #定时器运行间隔
no-tolerant: 4 #不耐受状态 tolerant: 1 #耐受状态
dt: 200 #延迟时间ms dt: 200 #延迟时间ms