修复数据表不存在时报错问题

src/main/java/com/esv/datacenter/iot/module/devicemodel/service/impl/DeviceDataServiceImpl.java

@@ -60,7 +60,9 @@ public class DeviceDataServiceImpl implements DeviceDataService {
         BeanUtils.copyProperties(dataModelEntity, deviceDataVO);
 
         Map<String, Object> dataMap = selectCurrentData(deviceId, dataModelId);
-        deviceDataVO.setReportTime((Date) dataMap.get("time"));
+        if (dataMap != null && dataMap.containsKey("time")) {
+            deviceDataVO.setReportTime((Date) dataMap.get("time"));
+        }
 
         List<DataModelPropertyVO> propertyList = dataModelPropertyService.getModelPropertyList(dataModelId);
         if (propertyList != null && !propertyList.isEmpty()) {
@@ -68,12 +70,16 @@ public class DeviceDataServiceImpl implements DeviceDataService {
 //            List<String> columnNames = new ArrayList<>();
 //            propertyList.forEach(v -> columnNames.add(v.getPropertyCode()));
 
-
             for (DataModelPropertyVO dataModelPropertyVO : propertyList) {
                 DeviceDataPropertyVO deviceDataPropertyVO = new DeviceDataPropertyVO();
                 BeanUtils.copyProperties(dataModelPropertyVO, deviceDataPropertyVO);
-                String propertyValue = String.valueOf(dataMap.get(deviceDataPropertyVO.getPropertyCode()));
-                deviceDataPropertyVO.setPropertyValue(propertyValue);
+                String propertyCode = deviceDataPropertyVO.getPropertyCode();
+                // 获取最新数据
+                if (dataMap != null && dataMap.containsKey(propertyCode)) {
+                    String propertyValue = String.valueOf(dataMap.get(propertyCode));
+                    deviceDataPropertyVO.setPropertyValue(propertyValue);
+                }
+                // 加入到返回结果集
                 list.add(deviceDataPropertyVO);
             }
             deviceDataVO.setPropertyList(list);
@@ -88,7 +94,12 @@ public class DeviceDataServiceImpl implements DeviceDataService {
                 + tableName
                 + " where device_id = ?"
                 + " order by time desc limit 1";
-        return jdbcTemplate.queryForMap(sql, deviceId);
+        try {
+            return jdbcTemplate.queryForMap(sql, deviceId);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return null;
+        }
     }
 
 }