设备弹窗-供电数据接口增加实时数据realData以及对接口进行排序

fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java

@@ -89,8 +89,12 @@ public class DeviceDetailController  extends BaseController {
         if (null == queryLogVo.getDeviceId() || queryLogVo.getDeviceId() == 0L) {
             return AjaxResult.error("请选择设备");
         }
+        //设备历史echart数据
         List<Object> list = deviceDetailService.gongdianChart(queryLogVo);
-        return AjaxResult.success(list);
+        AjaxResult ajaxResult = AjaxResult.success();
+        ajaxResult.put("data", list);
+        ajaxResult.put("realData", deviceDetailService.gongdianRealData(queryLogVo));
+        return ajaxResult;
     }