Merge remote-tracking branch 'origin/master'

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) {
                 //发送成功
@@ -409,7 +409,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
             if ("温度传感器".equals(deviceModel)){
                 continue;
             }
-            if ("总电表".equals(deviceModel)){
+            if ("电表".equals(deviceModel)){
                 continue;
             }
             DeviceStatusVo deviceStatusVo = new DeviceStatusVo();

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;