微调
This commit is contained in:
@@ -328,7 +328,9 @@ public class SocketFreqConverterService {
|
||||
if (ObjectUtil.isNotNull(this.lastTolerancePoint)) {
|
||||
boolean isNewGroup = this.isNewGroup(this.lastTolerancePoint, newTolerantPointVO);
|
||||
if (isNewGroup) {
|
||||
if (this.lastTolerancePoint.getTolerant() == 1 && newTolerantPointVO.getTolerant() == 1) {
|
||||
// 纵向分组
|
||||
if (freqConverterConfig.getDirection() == 1) {
|
||||
if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 1) {
|
||||
TolerantPointVO featurePointVO = new TolerantPointVO();
|
||||
featurePointVO.setResidualVoltage(this.lastTolerancePoint.getResidualVoltage());
|
||||
featurePointVO.setDurationMs(this.lastTolerancePoint.getDurationMs());
|
||||
@@ -337,6 +339,7 @@ public class SocketFreqConverterService {
|
||||
WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
|
||||
testRes.setTolerant(2);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 0) {
|
||||
TolerantPointVO featurePointVO = new TolerantPointVO();
|
||||
|
||||
Reference in New Issue
Block a user