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-07 08:52:17 +08:00
parent f640afb4ed
commit 08dff063c9
4 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,18 +376,18 @@ public class SocketFreqConverterService {
* @return
*/
private boolean isNewGroup(TolerantPointVO lastTolerancePoint, TolerantPointVO newTolerantPointVO) {
// // 纵向分租
// if (newTolerantPointVO.getResidualVoltage() - lastTolerancePoint.getResidualVoltage() >= 2 && newTolerantPointVO.getDurationMs() - lastTolerancePoint.getDurationMs() >= 10) {
// return true;
// }
// // 横向分组
// if (lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs() >= 10 && lastTolerancePoint.getResidualVoltage() - newTolerantPointVO.getResidualVoltage() >= 2) {
// return true;
// }
if (Math.abs(lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs()) >= 10 && Math.abs(lastTolerancePoint.getResidualVoltage() - newTolerantPointVO.getResidualVoltage()) >= 2) {
return true;
// 横向分组
if (freqConverterConfig.getDirection() == 0) {
return lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs() <= -10;
}
// 纵向分租
if (freqConverterConfig.getDirection() == 1) {
return lastTolerancePoint.getResidualVoltage() - newTolerantPointVO.getResidualVoltage() <= -2;
}
// if (Math.abs(lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs()) >= 10 && Math.abs(lastTolerancePoint.getResidualVoltage() - newTolerantPointVO.getResidualVoltage()) >= 2) {
// return true;
// }
return false;
}
}

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

@@ -15,4 +15,5 @@ public class FreqConverterConfig {
private Long schedulePeriod;
private Integer tolerant;
private Integer dt;
private Integer direction;
}

18
detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java
View File

@@ -27,23 +27,7 @@ public class PqFreqConverterTestResServiceImpl extends ServiceImpl<PqFreqConvert
@Override
public boolean saveOrUpdateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) {
DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix);
List<PqFreqConverterTestRes> existedTestResList = new ArrayList<>();
List<PqFreqConverterTestRes> newTestResList = new ArrayList<>();
for (PqFreqConverterTestRes testRes : testResList) {
if (ObjectUtil.isNotNull(testRes.getId())) {
existedTestResList.add(testRes);
} else {
newTestResList.add(testRes);
}
}
if (existedTestResList.size() > 0) {
this.updateBatchById(existedTestResList);
}
if (newTestResList.size() > 0) {
this.saveBatch(newTestResList);
}
this.saveOrUpdateBatch(testResList);
DynamicTableNameHandler.remove();
return true;
}