Commit fc57988f zshaohui

温湿度求平均值保留2位

1 个父辈 609485a3
...@@ -50,6 +50,7 @@ import org.springframework.util.ObjectUtils; ...@@ -50,6 +50,7 @@ import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.text.DecimalFormat;
import java.util.*; import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -425,6 +426,7 @@ public class BoxKanbanController { ...@@ -425,6 +426,7 @@ public class BoxKanbanController {
} }
private BoxStatusDto getBoxDto(Storage storage,List<DataLog> allTasks,Locale locale) { private BoxStatusDto getBoxDto(Storage storage,List<DataLog> allTasks,Locale locale) {
DecimalFormat df = new DecimalFormat("######0.00");
int inTask = 0; int inTask = 0;
int outTask = 0; int outTask = 0;
for (DataLog data : allTasks) { for (DataLog data : allTasks) {
...@@ -469,12 +471,12 @@ public class BoxKanbanController { ...@@ -469,12 +471,12 @@ public class BoxKanbanController {
//得到温度平均值 //得到温度平均值
Double humidityAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getHumidity)); Double humidityAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getHumidity));
if (humidityAgv != null){ if (humidityAgv != null){
boxDto.setHumidity(humidityAgv + ""); boxDto.setHumidity(df.format(humidityAgv) + "");
} }
//得到湿度平均值 //得到湿度平均值
Double temperatureAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getTemperature)); Double temperatureAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getTemperature));
if (temperatureAgv != null){ if (temperatureAgv != null){
boxDto.setTemperature(temperatureAgv + ""); boxDto.setTemperature(df.format(temperatureAgv) + "");
} }
} }
} }
...@@ -515,12 +517,12 @@ public class BoxKanbanController { ...@@ -515,12 +517,12 @@ public class BoxKanbanController {
//得到温度平均值 //得到温度平均值
Double humidityAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getHumidity)); Double humidityAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getHumidity));
if (humidityAgv != null){ if (humidityAgv != null){
boxDto.setHumidity(humidityAgv + ""); boxDto.setHumidity(df.format(humidityAgv) + "");
} }
//得到湿度平均值 //得到湿度平均值
Double temperatureAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getTemperature)); Double temperatureAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getTemperature));
if (temperatureAgv != null){ if (temperatureAgv != null){
boxDto.setTemperature(temperatureAgv + ""); boxDto.setTemperature(df.format(temperatureAgv) + "");
} }
} }
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!