diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
index 0d91534..cc3c17a 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
@@ -7,14 +7,15 @@ import com.xzzn.common.core.page.TableDataInfo;
 import com.xzzn.common.utils.file.FileUploadUtils;
 import com.xzzn.common.utils.file.MimeTypeUtils;
 import com.xzzn.ems.domain.EmsDevicesSetting;
-import com.xzzn.ems.domain.EmsPointMatch;
 import com.xzzn.ems.domain.EmsSiteSetting;
+import com.xzzn.ems.domain.vo.PointDataRequest;
 import com.xzzn.ems.domain.vo.PointQueryResponse;
 import com.xzzn.ems.domain.vo.SiteDeviceListVo;
 import com.xzzn.ems.mapper.EmsPointMatchMapper;
 import com.xzzn.ems.service.IEmsDeviceSettingService;
 import com.xzzn.ems.service.IEmsSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -146,12 +147,9 @@ public class EmsSiteConfigController extends BaseController{
      * 单个站点单个设备点位查询
      */
     @GetMapping("/getDevicePointList")
-    public TableDataInfo getDevicePointList(@RequestParam String siteId,@RequestParam String deviceId,
-                                            @RequestParam String deviceCategory, String sortMethod,
-                                            String dataPointName, String dataPoint)
+    public TableDataInfo getDevicePointList(@Validated PointDataRequest request)
     {
-        List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(
-                    siteId,deviceId,deviceCategory,dataPointName,dataPoint,sortMethod);
+        List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(request);
         return getDataTable2(result);
     }
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
index a578449..87cf5d9 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
@@ -3,6 +3,7 @@ package com.xzzn.ems.service;
 import com.xzzn.common.enums.DeviceCategory;
 import com.xzzn.ems.domain.EmsDevicesSetting;
 import com.xzzn.ems.domain.EmsPointMatch;
+import com.xzzn.ems.domain.vo.PointDataRequest;
 import com.xzzn.ems.domain.vo.PointQueryResponse;
 
 import java.util.List;
@@ -24,6 +25,5 @@ public interface IEmsDeviceSettingService
 
     public  List<DeviceCategory> getDeviceCategory();
 
-    public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory,
-                                                              String dataPointName, String dataPoint, String sortMethod);
+    public List<PointQueryResponse> getSingleSiteDevicePoints(PointDataRequest request);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java
index 88358e1..9a0fe0a 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java
@@ -30,7 +30,7 @@ public interface ISingleSiteService
     public List<BatteryDataStatsListVo> getClusterDataInfoList(String clusterDeviceId,String siteId,
                                                                String stackDeviceId, String batteryId);
 
-    public AmmeterDataResponse getAmmeterDataList(String siteId);
+    public List<AmmeterDataVo> getAmmeterDataList(String siteId);
 
     public SiteMonitorRuningInfoVo getRunningGraphStackTemp(String siteId);