Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

zbj//1.算法bug解决

Browse Source
This commit is contained in:
zhangbaojian
2023-07-05 13:54:15 +08:00
parent 19cf002d31
commit 52ad2e054e
3 changed files with 927 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RAlarmCountServiceImpl.java
View File

@@ -551,7 +551,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
zwwtResult.get(0).setHarmonicTypeGrade(0);
zwwtResult.get(1).setHarmonicTypeGrade(1);
} else {
i = (int) (zwwtResult.size() * 0.3);
i = (int) (zwwtResult.size() * 0.3)+1;
if (i < 1) {
i = 1;
}
@@ -581,7 +581,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
zwztResult.get(0).setEventTypeGrade(0);
zwztResult.get(1).setEventTypeGrade(1);
} else {
i = (int) (zwztResult.size() * 0.3);
i = (int) (zwztResult.size() * 0.3)+1;
if (i < 1) {
i = 1;
}
@@ -620,7 +620,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
pwwtResult.get(0).setHarmonicTypeGrade(0);
pwwtResult.get(1).setHarmonicTypeGrade(1);
} else {
i = (int) (pwwtResult.size() * 0.3);
i = (int) (pwwtResult.size() * 0.3)+1;
if (i < 1) {
i = 1;
}
@@ -650,7 +650,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
pwztResult.get(0).setEventTypeGrade(0);
pwztResult.get(1).setEventTypeGrade(1);
} else {
i = (int) (pwztResult.size() * 0.3);
i = (int) (pwztResult.size() * 0.3)+1;
if (i < 1) {
i = 1;
}
@@ -665,7 +665,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
}
//循环中等的
for (RStatAreaAlarmCountMPO rStatAreaAlarmCountMPO : pwztResult) {
if (Objects.isNull(rStatAreaAlarmCountMPO.getHarmonicTypeGrade())) {
if (Objects.isNull(rStatAreaAlarmCountMPO.getEventTypeGrade())) {
rStatAreaAlarmCountMPO.setEventTypeGrade(1);
}
}

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java
View File

@@ -613,7 +613,7 @@ public class RStatEventServiceImpl implements RStatEventService {
//天表
rStatEventDPOQueryWrapper.clear();
rStatEventDPOQueryWrapper.
in("measurement_point_id", collect1).
eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
between("data_date", startDate, endDate).
eq("measurement_type_class", getmeasurementType(k, lineSortMap)).
eq("data_type", dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
@@ -622,7 +622,7 @@ public class RStatEventServiceImpl implements RStatEventService {
//月表
rStatEventMPOQueryWrapper.clear();
rStatEventMPOQueryWrapper.
in("measurement_point_id", collect1).
eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
between("data_date", startDate, endDate).
eq("measurement_type_class", getmeasurementType(k, lineSortMap)).
eq("data_type", dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());

1818
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatSubstationServiceImpl.java
View File

File diff suppressed because it is too large Load Diff