温湿度页面展示平均值

src/main/java/com/neotel/smfcore/core/humiture/rest/HumitureController.java

@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.humiture.rest.bean.dto.HumitureDto;
 import com.neotel.smfcore.core.humiture.rest.bean.query.HumitureQueryCriteria;
+import com.neotel.smfcore.core.kanban.rest.bean.HumiAndtemp;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.msd.bean.MSDSettiings;
 import com.neotel.smfcore.core.storage.service.po.Storage;
@@ -27,8 +28,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Slf4j
@@ -41,6 +44,8 @@ public class HumitureController {
     @Autowired
     DataCache dataCache;
 
+    DecimalFormat df  = new DecimalFormat("######0.0");
+
     @ApiOperation("获取温湿度")
     @GetMapping("api/humiture/list")
     @AnonymousAccess
@@ -73,29 +78,39 @@ public class HumitureController {
         query.addCriteria(Criteria.where("humiAndtempListStr").exists(true));
 
         PageData<Humiture> resultList = new PageData<>();
-        int resultTotalElements = 0;
+
         List<Humiture> resultHumitureList = new ArrayList<>();
 
         PageData<Humiture> humitureList = humitureManager.findByPage(query, pageable);
         int totalElements = humitureList.getTotalElements();
         if (totalElements != 0) {
-            resultTotalElements = totalElements;
             List<Humiture> content = humitureList.getContent();
             for (Humiture humiture : content) {
                 String humiAndtempListStr = humiture.getHumiAndtempListStr();
                 if (StringUtils.isNotBlank(humiAndtempListStr)){
-                    List<Humiture> subHumiAndtempList = JsonUtil.toList(humiAndtempListStr, Humiture.class);
-                    for (Humiture subHumiture : subHumiAndtempList) {
-                        subHumiture.setCid(humiture.getCid()+"-"+subHumiture.getId());
-                        subHumiture.setCreateDate(humiture.getCreateDate());
-                        subHumiture.setUpdateDate(humiture.getUpdateDate());
-                        resultHumitureList.add(subHumiture);
+
+                    Humiture resultHumiture = new Humiture();
+                    resultHumiture.setCid(humiture.getCid());
+                    resultHumiture.setCreateDate(humiture.getCreateDate());
+                    resultHumiture.setUpdateDate(humiture.getUpdateDate());
+                    resultHumiture.setId(humiture.getId());
+
+                    List<HumiAndtemp> humiAndtempList = JsonUtil.toList(humiAndtempListStr, HumiAndtemp.class);
+                    Double humidityAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getHumidity));
+                    if (humidityAgv != null){
+                        resultHumiture.setHumidity(df.format(humidityAgv));
+                    }
+
+                    Double temperatureAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getTemperature));
+                    if (temperatureAgv != null){
+                        resultHumiture.setTemperature(df.format(temperatureAgv));
                     }
+                    resultHumitureList.add(resultHumiture);
                 }
             }
         }
 
-        resultList.setTotalElements(resultTotalElements);
+        resultList.setTotalElements(totalElements);
         resultList.setContent(resultHumitureList);
 
         HumitureDto restultDto = new HumitureDto();