Skip to content

A
amos-boot-biz
Commit 45530dd0 authored by caotao's avatar caotao
Browse files
Options

BUG:泰和没有功率曲线

parent 49d49c6b
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java
View file @ 45530dd0
...@@ -1212,37 +1212,37 @@ public class MonitoringServiceImpl { ...@@ -1212,37 +1212,37 @@ public class MonitoringServiceImpl {
result.put("superShortPower", superShortPowerHashMap); result.put("superShortPower", superShortPowerHashMap);
HashMap<String, Object> footerList = new HashMap<>(); HashMap<String, Object> footerList = new HashMap<>();
String currentMin = String.format(CommonConstans.Twodecimalplaces, currentPowerYdata.stream().mapToDouble(Double::parseDouble).min().getAsDouble()); String currentMin = String.format(CommonConstans.Twodecimalplaces, currentPowerYdata.stream().mapToDouble(Double::parseDouble).min().getAsDouble());
String shortMin = String.format(CommonConstans.Twodecimalplaces, shortPowerYdata.stream().mapToDouble(Double::parseDouble).min().getAsDouble()); // String shortMin = String.format(CommonConstans.Twodecimalplaces, shortPowerYdata.stream().mapToDouble(Double::parseDouble).min().getAsDouble());
String supreMin = String.format(CommonConstans.Twodecimalplaces, superPowerShortYdata.stream().mapToDouble(Double::parseDouble).min().getAsDouble()); // String supreMin = String.format(CommonConstans.Twodecimalplaces, superPowerShortYdata.stream().mapToDouble(Double::parseDouble).min().getAsDouble());
List<String> gz = new ArrayList<>(); List<String> gz = new ArrayList<>();
List<String> sj1 = new ArrayList<>(); List<String> sj1 = new ArrayList<>();
gz.add(currentMin); gz.add(currentMin);
sj1.add(xdata.get(currentPowerYdata.indexOf(currentMin))); sj1.add(xdata.get(currentPowerYdata.indexOf(currentMin)));
gz.add(shortMin); gz.add("0");
sj1.add(xdata.get(shortPowerYdata.indexOf(shortMin))); sj1.add("0:00");
gz.add(supreMin); gz.add("0");
sj1.add(xdata.get(superPowerShortYdata.indexOf(supreMin))); sj1.add("0:00");
String currentMax = String.format(CommonConstans.Twodecimalplaces, currentPowerYdata.stream().mapToDouble(Double::parseDouble).max().getAsDouble()); String currentMax = String.format(CommonConstans.Twodecimalplaces, currentPowerYdata.stream().mapToDouble(Double::parseDouble).max().getAsDouble());
String shortMax = String.format(CommonConstans.Twodecimalplaces, shortPowerYdata.stream().mapToDouble(Double::parseDouble).max().getAsDouble()); // String shortMax = String.format(CommonConstans.Twodecimalplaces, shortPowerYdata.stream().mapToDouble(Double::parseDouble).max().getAsDouble());
String supreMax = String.format(CommonConstans.Twodecimalplaces, superPowerShortYdata.stream().mapToDouble(Double::parseDouble).max().getAsDouble()); // String supreMax = String.format(CommonConstans.Twodecimalplaces, superPowerShortYdata.stream().mapToDouble(Double::parseDouble).max().getAsDouble());
List<String> zdz = new ArrayList<>(); List<String> zdz = new ArrayList<>();
List<String> sj2 = new ArrayList<>(); List<String> sj2 = new ArrayList<>();
zdz.add(currentMax); zdz.add(currentMax);
zdz.add(shortMax); zdz.add("0");
zdz.add(supreMax); zdz.add("0");
sj2.add(xdata.get(currentPowerYdata.indexOf(currentMax))); sj2.add(xdata.get(currentPowerYdata.indexOf(currentMax)));
sj2.add(xdata.get(shortPowerYdata.indexOf(shortMax))); sj2.add("0:00");
sj2.add(xdata.get(superPowerShortYdata.indexOf(supreMax))); sj2.add("0:00");
String currentAvg = String.format(CommonConstans.Twodecimalplaces, currentPowerYdata.stream().mapToDouble(Double::parseDouble).average().getAsDouble()); String currentAvg = String.format(CommonConstans.Twodecimalplaces, currentPowerYdata.stream().mapToDouble(Double::parseDouble).average().getAsDouble());
String shortAvg = String.format(CommonConstans.Twodecimalplaces, shortPowerYdata.stream().mapToDouble(Double::parseDouble).average().getAsDouble()); // String shortAvg = String.format(CommonConstans.Twodecimalplaces, shortPowerYdata.stream().mapToDouble(Double::parseDouble).average().getAsDouble());
String supreAvg = String.format(CommonConstans.Twodecimalplaces, superPowerShortYdata.stream().mapToDouble(Double::parseDouble).average().getAsDouble()); // String supreAvg = String.format(CommonConstans.Twodecimalplaces, superPowerShortYdata.stream().mapToDouble(Double::parseDouble).average().getAsDouble());
List<String> pjz = new ArrayList<>(); List<String> pjz = new ArrayList<>();
List<String> fjl = new ArrayList<>(); List<String> fjl = new ArrayList<>();
pjz.add(currentAvg); pjz.add(currentAvg);
pjz.add(shortAvg); pjz.add("0");
pjz.add(supreAvg); pjz.add("0");
fjl = Arrays.asList("0.68", "0.89", "0.56"); fjl = Arrays.asList("0.00", "0.00", "0.00");
footerList.put("gz", gz); footerList.put("gz", gz);
footerList.put("sj1", sj1); footerList.put("sj1", sj1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment