From c95eca84795d3cb013653801989f84a88c3b47ee Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Thu, 8 Jun 2023 17:32:51 +0800
Subject: [PATCH] =?UTF-8?q?2023-06-08=2016:53:48=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8E=B7=E5=8F=96=E5=8F=AF=E6=8E=A7=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PsdcDeviceServiceImpl.java   |  2 +-
 .../PsdcThermometerHtdataServiceImpl.java     | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
index 1230ca8..16484a7 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
@@ -380,7 +380,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
 
             String deviceName = psdcDeviceMapper.queryDeviceNameByDeviceId(psdcScene.getDeviceId());
             Boolean flag = Boolean.FALSE;
-            //TODO 发送MQTT指令
+            // TODO 发送MQTT指令
             flag = Boolean.TRUE;
             if (flag) {
                 //发送成功
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java
index 695bf93..d70cf5f 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java
@@ -11,6 +11,7 @@ import com.psdc.utils.SecurityUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,8 +40,8 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd");
-
     SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd HH");
+    DecimalFormat df = new DecimalFormat("#.00");
 
     @Override
     public AjaxResult selTodayThermometer() {
@@ -151,15 +152,17 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
         houseOutTemp = getaDouble(houseOutTemp, countOut, listTempOut, timesOut, tempOutList);
 
         Map<String, Object> mapIn = new HashMap();
-        mapIn.put("houseInTemp", houseInTemp);
+        mapIn.put("houseInTemp", Double.parseDouble(df.format(houseInTemp)));
         mapIn.put("listTempIn", listTempIn);
-        mapIn.put("timesIn", timesIn);
+        mapIn.put("houseOutTemp", Double.parseDouble(df.format(houseOutTemp)));
+        mapIn.put("listTempOut", listTempOut);
+        mapIn.put("times", timesIn);
         ary.add(mapIn);
-        Map<String, Object> mapOut = new HashMap();
-        mapOut.put("houseOutTemp", houseOutTemp);
-        mapOut.put("listTempOut", listTempOut);
-        mapOut.put("timesOut", timesOut);
-        ary.add(mapOut);
+//        Map<String, Object> mapOut = new HashMap();
+//        mapOut.put("houseOutTemp", houseOutTemp);
+//        mapOut.put("listTempOut", listTempOut);
+//        mapOut.put("timesOut", timesOut);
+//        ary.add(mapOut);
 
         return ary;
     }
@@ -170,7 +173,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
         }
         for (PsdcThermometerHtdata scr1 : tempList) {
             Double evIn = scr1.getThermometerValue() / count;
-            listTemp.add(evIn);
+            listTemp.add(Double.parseDouble(df.format(evIn)));
             times.add(scr1.getUpdateTime());
         }
         houseTemp = houseTemp / count;