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 cfa3086..6ee2da7 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
@@ -85,9 +85,10 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
     public List<PsdcDevice> queryAllByLimit(PsdcDevice psdcDevice) {
         List<PsdcDevice> list = psdcDeviceMapper.queryAllByLimit(psdcDevice);
         for (PsdcDevice dev : list){
-            dev.setDevType(s("t", dev.getDeviceType()));
-            dev.setDevStatus(s("s", dev.getDeviceStatus()));
-            dev.setDevRunstatus(s("r", dev.getDeviceRunstatus()));
+            // 导出时转换为String
+            dev.setDevType(coverStr("t", dev.getDeviceType()));
+            dev.setDevStatus(coverStr("s", dev.getDeviceStatus()));
+            dev.setDevRunstatus(coverStr("r", dev.getDeviceRunstatus()));
         }
 
         return list;
@@ -252,7 +253,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
 
     }
 
-    private String s(String s, int i) {
+    private String coverStr(String s, int i) {
         switch (s) {
             case "s":
                 switch (i) {
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 453ace8..bfb69e9 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
@@ -52,38 +52,41 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
         String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间
 
         for (Integer d : devList) {
-            // 查询今日实时温度数据
-            PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(d, sdf.format(date));
-
-            List<Double> listIn = new ArrayList(); // 今天历史进水温度集合
-            List<Double> listOut = new ArrayList(); // 今天历史出水温度集合
-            List<Double> listTemp = new ArrayList(); // 今天历史温度集合
-            List<String> times = new ArrayList(); // 时间轴
-
-            // 循环遍历今天历史数据对象集合
-            List<PsdcThermometerHtdata> htdata = psdcThermometerHtdataMapper.selTodayThermometer(d, tb, te);
-            for (PsdcThermometerHtdata h : htdata){
-                if (null != h.getThermometerValue()){
-                    listTemp.add(h.getThermometerValue());
-                }
-                if (null != h.getThermometerValueIn()){
-                    listIn.add(h.getThermometerValueIn());
-                }
-                if (null != h.getThermometerValueOut()){
-                    listOut.add(h.getThermometerValueOut());
+            // 今日如果无数据，空判断处理
+            if (null != psdcThermometerRtdataMapper.queryById(d, sdf.format(date))){
+                // 查询今日实时温度数据
+                PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(d, sdf.format(date));
+
+                List<Double> listIn = new ArrayList(); // 今天历史进水温度集合
+                List<Double> listOut = new ArrayList(); // 今天历史出水温度集合
+                List<Double> listTemp = new ArrayList(); // 今天历史温度集合
+                List<String> times = new ArrayList(); // 时间轴
+
+                // 循环遍历今天历史数据对象集合
+                List<PsdcThermometerHtdata> htdata = psdcThermometerHtdataMapper.selTodayThermometer(d, tb, te);
+                for (PsdcThermometerHtdata h : htdata){
+                    if (null != h.getThermometerValue()){
+                        listTemp.add(h.getThermometerValue());
+                    }
+                    if (null != h.getThermometerValueIn()){
+                        listIn.add(h.getThermometerValueIn());
+                    }
+                    if (null != h.getThermometerValueOut()){
+                        listOut.add(h.getThermometerValueOut());
+                    }
+
+                    String t = h.getUpdateTime().split(" ")[1].substring(0,5);
+                    times.add(t);
                 }
 
-                String t = h.getUpdateTime().split(" ")[1].substring(0,5);
-                times.add(t);
+                Double useEnergy = psdcElectricHtdataMapper.selTodayUseEnergy(d, tb, te);
+                dataRes.setTimeList(times);
+                dataRes.setTempTodayList(listTemp);
+                dataRes.setTempInTodayList(listIn);
+                dataRes.setTempOutTodayList(listOut);
+                dataRes.setTodayUseEnergy(useEnergy);
+                ary.add(dataRes);
             }
-
-            Double useEnergy = psdcElectricHtdataMapper.selTodayUseEnergy(d, tb, te);
-            dataRes.setTimeList(times);
-            dataRes.setTempTodayList(listTemp);
-            dataRes.setTempInTodayList(listIn);
-            dataRes.setTempOutTodayList(listOut);
-            dataRes.setTodayUseEnergy(useEnergy);
-            ary.add(dataRes);
         }
 
         AjaxResult r = new AjaxResult(200, "查询成功", ary);