From 2810f5e20414cb788dfe2aa260d630e1f8029d8f Mon Sep 17 00:00:00 2001 From: mashili Date: Wed, 24 Sep 2025 14:07:54 +0800 Subject: [PATCH] =?UTF-8?q?0918=E4=BC=98=E5=8C=96-=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=80=BC=E5=8F=8D=E5=90=91?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/ems/EmsSiteConfigController.java | 10 ++++------ .../com/xzzn/ems/service/IEmsDeviceSettingService.java | 4 ++-- .../java/com/xzzn/ems/service/ISingleSiteService.java | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) 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 result = iEmsDeviceSettingService.getSingleSiteDevicePoints( - siteId,deviceId,deviceCategory,dataPointName,dataPoint,sortMethod); + List 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 getDeviceCategory(); - public List getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory, - String dataPointName, String dataPoint, String sortMethod); + public List 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 getClusterDataInfoList(String clusterDeviceId,String siteId, String stackDeviceId, String batteryId); - public AmmeterDataResponse getAmmeterDataList(String siteId); + public List getAmmeterDataList(String siteId); public SiteMonitorRuningInfoVo getRunningGraphStackTemp(String siteId);