修改暂态报告里持续时间单位

This commit is contained in:
hzj
2026-01-16 14:43:58 +08:00
parent 977a0e7a35
commit c9301d1f8f

View File

@@ -4271,11 +4271,11 @@ public class ReportServiceImpl implements ReportService {
List<OB> obs = new ArrayList<>(); List<OB> obs = new ArrayList<>();
ArrayList<List<Double>> list = new ArrayList<>(); ArrayList<List<Double>> list = new ArrayList<>();
for (EventDetailNew eventDetail : detailList) { for (EventDetailNew eventDetail : detailList) {
obs.add(new OB(Double.parseDouble(eventDetail.getDuration() / 1000 + "") obs.add(new OB(Double.parseDouble(eventDetail.getDuration() + "")
, Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + ""))); , Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + "")));
ArrayList<Double> doubles = new ArrayList<>(); ArrayList<Double> doubles = new ArrayList<>();
doubles.add(Double.parseDouble(eventDetail.getDuration() / 1000 + "")); doubles.add(Double.parseDouble(eventDetail.getDuration() + ""));
doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100))); doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100)));
list.add(doubles); list.add(doubles);
} }
@@ -4332,10 +4332,10 @@ public class ReportServiceImpl implements ReportService {
ArrayList<List<Double>> list = new ArrayList<>(); ArrayList<List<Double>> list = new ArrayList<>();
for (EventDetailNew eventDetail : detailList) { for (EventDetailNew eventDetail : detailList) {
obs.add(new OB(Double.parseDouble(eventDetail.getDuration() / 1000 + ""), Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + ""))); obs.add(new OB(Double.parseDouble(eventDetail.getDuration() + ""), Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + "")));
ArrayList<Double> doubles = new ArrayList<>(); ArrayList<Double> doubles = new ArrayList<>();
doubles.add(Double.parseDouble(eventDetail.getDuration() / 1000 + "")); doubles.add(Double.parseDouble(eventDetail.getDuration() + ""));
doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100))); doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100)));
list.add(doubles); list.add(doubles);
} }
@@ -7203,11 +7203,11 @@ public class ReportServiceImpl implements ReportService {
List<OB> obs = new ArrayList<>(); List<OB> obs = new ArrayList<>();
ArrayList<List<Double>> list = new ArrayList<>(); ArrayList<List<Double>> list = new ArrayList<>();
for (EventDetailNew eventDetail : detailList) { for (EventDetailNew eventDetail : detailList) {
obs.add(new OB(Double.parseDouble(eventDetail.getDuration() / 1000 + "") obs.add(new OB(Double.parseDouble(eventDetail.getDuration() + "")
, Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + ""))); , Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + "")));
ArrayList<Double> doubles = new ArrayList<>(); ArrayList<Double> doubles = new ArrayList<>();
doubles.add(Double.parseDouble(eventDetail.getDuration() / 1000 + "")); doubles.add(Double.parseDouble(eventDetail.getDuration() + ""));
doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100))); doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100)));
list.add(doubles); list.add(doubles);
} }
@@ -7264,10 +7264,10 @@ public class ReportServiceImpl implements ReportService {
ArrayList<List<Double>> list = new ArrayList<>(); ArrayList<List<Double>> list = new ArrayList<>();
for (EventDetailNew eventDetail : detailList) { for (EventDetailNew eventDetail : detailList) {
obs.add(new OB(Double.parseDouble(eventDetail.getDuration() / 1000 + ""), Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + ""))); obs.add(new OB(Double.parseDouble(eventDetail.getDuration() + ""), Double.parseDouble(eventDetail.getFeatureAmplitude() * 100 + "")));
ArrayList<Double> doubles = new ArrayList<>(); ArrayList<Double> doubles = new ArrayList<>();
doubles.add(Double.parseDouble(eventDetail.getDuration() / 1000 + "")); doubles.add(Double.parseDouble(eventDetail.getDuration() + ""));
doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100))); doubles.add(Double.parseDouble(String.valueOf(eventDetail.getFeatureAmplitude() * 100)));
list.add(doubles); list.add(doubles);
} }
@@ -7991,7 +7991,7 @@ public class ReportServiceImpl implements ReportService {
} }
for (int i = 0; i < areaTableParam.getInfo().size(); i++) { for (int i = 0; i < areaTableParam.getInfo().size(); i++) {
Double eventvalue = areaTableParam.getInfo().get(i).getFeatureAmplitude(); Double eventvalue = areaTableParam.getInfo().get(i).getFeatureAmplitude();
double persisttime = areaTableParam.getInfo().get(i).getDuration(); double persisttime = areaTableParam.getInfo().get(i).getDuration()*1000;
if (eventvalue * 100 < 1 && eventvalue * 100 >= 0) { if (eventvalue * 100 < 1 && eventvalue * 100 >= 0) {
if (persisttime > 10 && persisttime <= 100) { if (persisttime > 10 && persisttime <= 100) {
arr[16][0]++; arr[16][0]++;
@@ -8719,28 +8719,28 @@ public class ReportServiceImpl implements ReportService {
List<String> sisttime = new ArrayList<>(); List<String> sisttime = new ArrayList<>();
for (EventDetailNew eventDetail : info) { for (EventDetailNew eventDetail : info) {
Double persistTime = eventDetail.getDuration(); Double persistTime = eventDetail.getDuration();
if (persistTime / 1000 < 0.1) { if (persistTime < 0.1) {
timeMap2.put("<0.1", timeMap2.get("<0.1") + 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); 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); timeMap2.put("<0.5", timeMap2.get("<0.5") + 1);
} }
if (persistTime / 1000 < 1) { if (persistTime < 1) {
timeMap2.put("<1", timeMap2.get("<1") + 1); timeMap2.put("<1", timeMap2.get("<1") + 1);
} }
if (persistTime / 1000 < 3) { if (persistTime < 3) {
timeMap2.put("<3", timeMap2.get("<3") + 1); timeMap2.put("<3", timeMap2.get("<3") + 1);
} }
if (persistTime / 1000 < 20) { if (persistTime < 20) {
timeMap2.put("<20", timeMap2.get("<20") + 1); timeMap2.put("<20", timeMap2.get("<20") + 1);
} }
if (persistTime / 1000 < 60) { if (persistTime < 60) {
timeMap2.put("<60", timeMap2.get("<60") + 1); timeMap2.put("<60", timeMap2.get("<60") + 1);
} }
if (persistTime / 1000 < 180) { if (persistTime < 180) {
timeMap2.put("<180", timeMap2.get("<180") + 1); timeMap2.put("<180", timeMap2.get("<180") + 1);
} }
} }