diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
index 29399331..723f5748 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
@@ -796,7 +796,8 @@ public class DcDeviceController extends BaseController {
             results.sort(Comparator.comparing(hashMap -> hashMap.get("timestamp")));
             return AjaxResult.success(results);
         }
-        if (UniversalEnum.THREE.getValue().equals(deviceType)||UniversalEnum.SEVENTEEN.getValue().equals(deviceType)){ //气象预警/ups设备
+        if (UniversalEnum.THREE.getValue().equals(deviceType)||UniversalEnum.SEVENTEEN.getValue().equals(deviceType)||
+                UniversalEnum.FIFTEEN.getValue().equals(deviceType)){ //气象预警/ups设备/太阳能板
             JSONObject data = (JSONObject) ajaxResult.get("data");
             JSONArray dataValue = (JSONArray) data.get("data");
             List<JSONObject> jsonObjectList = dataValue.toJavaList(JSONObject.class);