2023-05-12 15:37:06 增加空判断处理!

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()));
+            // 导出时转换为String
-            dev.setDevStatus(s("s", dev.getDeviceStatus()));
+            dev.setDevType(coverStr("t", dev.getDeviceType()));
-            dev.setDevRunstatus(s("r", dev.getDeviceRunstatus()));
+            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) {

psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java

@@ -52,6 +52,8 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
         String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间
 
         for (Integer d : devList) {
+            // 今日如果无数据，空判断处理
+            if (null != psdcThermometerRtdataMapper.queryById(d, sdf.format(date))){
                 // 查询今日实时温度数据
                 PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(d, sdf.format(date));
 
@@ -85,6 +87,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
                 dataRes.setTodayUseEnergy(useEnergy);
                 ary.add(dataRes);
             }
+        }
 
         AjaxResult r = new AjaxResult(200, "查询成功", ary);
         return r;