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

定版bug修改

Browse Source
This commit is contained in:
chendaofei
2025-07-15 16:30:54 +08:00
parent bc5abdae14
commit b93db7cd08
8 changed files with 155 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
View File

@@ -1021,6 +1021,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
}
//计数map
HashMap<String, Integer> countMap = new HashMap<>();
countMap.put("=0", 0);
countMap.put("<10", 0);
countMap.put("<20", 0);
countMap.put("<30", 0);
@@ -1032,6 +1033,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
countMap.put("<90", 0);
//分段计数
HashMap<String, Integer> subsectionMap = new HashMap<>();
subsectionMap.put("0", 0);
subsectionMap.put("0~10", 0);
subsectionMap.put("10~20", 0);
subsectionMap.put("20~30", 0);
@@ -1043,6 +1045,9 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
subsectionMap.put("80~90", 0);
//求数量
for (EventDetail eventDetail : info) {
if (eventDetail.getFeatureAmplitude() == 0.00) {
countMap.put("=0", (countMap.get("=0") + 1));
}
if (eventDetail.getFeatureAmplitude() < 0.1) {
countMap.put("<10", (countMap.get("<10") + 1));
}
@@ -1073,7 +1078,9 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
}
//求每段数量
for (EventDetail eventDetail : info) {
if (eventDetail.getFeatureAmplitude() < 0.1) {
if (eventDetail.getFeatureAmplitude() ==0) {
subsectionMap.put("0", (subsectionMap.get("0") + 1));
} else if (eventDetail.getFeatureAmplitude() > 0 && eventDetail.getFeatureAmplitude() < 0.1) {
subsectionMap.put("0~10", (subsectionMap.get("0~10") + 1));
} else if (eventDetail.getFeatureAmplitude() > 0.1 && eventDetail.getFeatureAmplitude() < 0.2) {
subsectionMap.put("10~20", (subsectionMap.get("10~20") + 1));
@@ -1097,6 +1104,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
List<String> pereventvalue = new ArrayList<>();
Set<String> subsectionSet = subsectionMap.keySet();
List<String> strings1 = new ArrayList<>();
strings1.add("0");
strings1.add("0~10");
strings1.add("10~20");
strings1.add("20~30");
@@ -1126,6 +1134,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
//求eventvalue
List<String> eventvalue = new ArrayList<>();
List<String> strings = new ArrayList<>();
strings.add("=0");
strings.add("<10");
strings.add("<20");
strings.add("<30");
@@ -1153,10 +1162,10 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
}
}
}
eventvalue.add("100.00");
result.setEventvalue(eventvalue);
//时间
HashMap<String, Integer> timeMap = new HashMap<>();
timeMap.put("<0.01", 0);
timeMap.put("<0.1", 0);
timeMap.put("<0.25", 0);
timeMap.put("<0.5", 0);
@@ -1168,25 +1177,28 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
//求不同时间段的总数
for (EventDetail eventDetail : info) {
Double persistTime = eventDetail.getDuration();
if (persistTime / 1000 < 0.1) {
if (persistTime < 0.01 ) {
timeMap.put("<0.1", timeMap.get("<0.1") + 1);
} else if (persistTime / 1000 > 0.1 && persistTime / 1000 < 0.25) {
} else if (persistTime >= 0.01 && persistTime < 0.1) {
timeMap.put("<0.1", timeMap.get("<0.1") + 1);
} else if (persistTime >= 0.1 && persistTime < 0.25) {
timeMap.put("<0.25", timeMap.get("<0.25") + 1);
} else if (persistTime / 1000 > 0.25 && persistTime / 1000 < 0.5) {
} else if (persistTime >= 0.25 && persistTime < 0.5) {
timeMap.put("<0.5", timeMap.get("<0.5") + 1);
} else if (persistTime / 1000 > 0.5 && persistTime / 1000 < 1) {
} else if (persistTime >= 0.5 && persistTime < 1) {
timeMap.put("<1", timeMap.get("<1") + 1);
} else if (persistTime / 1000 > 1 && persistTime / 1000 < 3) {
} else if (persistTime >= 1 && persistTime < 3) {
timeMap.put("<3", timeMap.get("<3") + 1);
} else if (persistTime / 1000 > 3 && persistTime / 1000 < 20) {
} else if (persistTime >= 3 && persistTime < 20) {
timeMap.put("<20", timeMap.get("<20") + 1);
} else if (persistTime / 1000 > 20 && persistTime / 1000 < 60) {
} else if (persistTime >= 20 && persistTime < 60) {
timeMap.put("<60", timeMap.get("<60") + 1);
} else if (persistTime / 1000 > 60 && persistTime / 1000 < 180) {
} else if (persistTime >= 60 && persistTime < 180) {
timeMap.put("<180", timeMap.get("<180") + 1);
}
}
List<String> strings2 = new ArrayList<>();
strings2.add("<0.01");
strings2.add("<0.1");
strings2.add("<0.25");
strings2.add("<0.5");
@@ -1217,6 +1229,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
result.setPersisttime(persisttime);
HashMap<String, Integer> timeMap2 = new HashMap<>();
timeMap2.put("<0.01", 0);
timeMap2.put("<0.1", 0);
timeMap2.put("<0.25", 0);
timeMap2.put("<0.5", 0);
@@ -1229,28 +1242,31 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
List<String> sisttime = new ArrayList<>();
for (EventDetail eventDetail : info) {
Double persistTime = eventDetail.getDuration();
if (persistTime / 1000 < 0.1) {
if (persistTime < 0.01) {
timeMap2.put("<0.01", timeMap2.get("<0.01") + 1);
}
if (persistTime < 0.1) {
timeMap2.put("<0.1", timeMap2.get("<0.1") + 1);
}
if (persistTime / 1000 < 0.25) {
if (persistTime < 0.25) {
timeMap2.put("<0.25", timeMap2.get("<0.25") + 1);
}
if (persistTime / 1000 < 0.5) {
if (persistTime < 0.5) {
timeMap2.put("<0.5", timeMap2.get("<0.5") + 1);
}
if (persistTime / 1000 < 1) {
if (persistTime < 1) {
timeMap2.put("<1", timeMap2.get("<1") + 1);
}
if (persistTime / 1000 < 3) {
if (persistTime < 3) {
timeMap2.put("<3", timeMap2.get("<3") + 1);
}
if (persistTime / 1000 < 20) {
if (persistTime < 20) {
timeMap2.put("<20", timeMap2.get("<20") + 1);
}
if (persistTime / 1000 < 60) {
if (persistTime < 60) {
timeMap2.put("<60", timeMap2.get("<60") + 1);
}
if (persistTime / 1000 < 180) {
if (persistTime < 180) {
timeMap2.put("<180", timeMap2.get("<180") + 1);
}
}
@@ -1271,7 +1287,6 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
}
}
}
sisttime.add("100.00");
result.setSisttime(sisttime);
return result;
}