xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0918优化-点位列表数据值反向搜索

Browse Source
This commit is contained in:
mashili
2025-09-24 14:07:54 +08:00
parent 7cd5a9b131
commit 2810f5e204
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
View File

@ -7,14 +7,15 @@ import com.xzzn.common.core.page.TableDataInfo;
import com.xzzn.common.utils.file.FileUploadUtils; import com.xzzn.common.utils.file.FileUploadUtils;
import com.xzzn.common.utils.file.MimeTypeUtils; import com.xzzn.common.utils.file.MimeTypeUtils;
import com.xzzn.ems.domain.EmsDevicesSetting; import com.xzzn.ems.domain.EmsDevicesSetting;
import com.xzzn.ems.domain.EmsPointMatch;
import com.xzzn.ems.domain.EmsSiteSetting; 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.PointQueryResponse;
import com.xzzn.ems.domain.vo.SiteDeviceListVo; import com.xzzn.ems.domain.vo.SiteDeviceListVo;
import com.xzzn.ems.mapper.EmsPointMatchMapper; import com.xzzn.ems.mapper.EmsPointMatchMapper;
import com.xzzn.ems.service.IEmsDeviceSettingService; import com.xzzn.ems.service.IEmsDeviceSettingService;
import com.xzzn.ems.service.IEmsSiteService; import com.xzzn.ems.service.IEmsSiteService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -146,12 +147,9 @@ public class EmsSiteConfigController extends BaseController{
* 单个站点单个设备点位查询 * 单个站点单个设备点位查询
*/ */
@GetMapping("/getDevicePointList") @GetMapping("/getDevicePointList")
public TableDataInfo getDevicePointList(@RequestParam String siteId,@RequestParam String deviceId, public TableDataInfo getDevicePointList(@Validated PointDataRequest request)
@RequestParam String deviceCategory, String sortMethod,
String dataPointName, String dataPoint)
{ {
List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints( List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(request);
siteId,deviceId,deviceCategory,dataPointName,dataPoint,sortMethod);
return getDataTable2(result); return getDataTable2(result);
} }
} }

4
ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
View File

@ -3,6 +3,7 @@ package com.xzzn.ems.service;
import com.xzzn.common.enums.DeviceCategory; import com.xzzn.common.enums.DeviceCategory;
import com.xzzn.ems.domain.EmsDevicesSetting; import com.xzzn.ems.domain.EmsDevicesSetting;
import com.xzzn.ems.domain.EmsPointMatch; import com.xzzn.ems.domain.EmsPointMatch;
import com.xzzn.ems.domain.vo.PointDataRequest;
import com.xzzn.ems.domain.vo.PointQueryResponse; import com.xzzn.ems.domain.vo.PointQueryResponse;
import java.util.List; import java.util.List;
@ -24,6 +25,5 @@ public interface IEmsDeviceSettingService
public List<DeviceCategory> getDeviceCategory(); public List<DeviceCategory> getDeviceCategory();
public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory, public List<PointQueryResponse> getSingleSiteDevicePoints(PointDataRequest request);
String dataPointName, String dataPoint, String sortMethod);
} }

2
ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java
View File

@ -30,7 +30,7 @@ public interface ISingleSiteService
public List<BatteryDataStatsListVo> getClusterDataInfoList(String clusterDeviceId,String siteId, public List<BatteryDataStatsListVo> getClusterDataInfoList(String clusterDeviceId,String siteId,
String stackDeviceId, String batteryId); String stackDeviceId, String batteryId);
public AmmeterDataResponse getAmmeterDataList(String siteId); public List<AmmeterDataVo> getAmmeterDataList(String siteId);
public SiteMonitorRuningInfoVo getRunningGraphStackTemp(String siteId); public SiteMonitorRuningInfoVo getRunningGraphStackTemp(String siteId);