From acee04de35c3f930b8006f8c5b8ac35b2a15df6a Mon Sep 17 00:00:00 2001 From: weitang Date: Tue, 20 May 2025 11:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8E=A5=E5=8F=A3=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E5=8F=98=E7=94=B5=E7=AB=99=E7=9A=84=E5=8D=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlgorithmClassComponentController.java | 4 ++-- .../algorithm/service/IAlgorithmClassComponentService.java | 2 +- .../service/impl/AlgorithmClassComponentServiceImpl.java | 3 ++- .../modules/auxcontrol/controller/MeterDeviceController.java | 5 +++-- .../modules/auxcontrol/service/IMeterDeviceService.java | 2 +- .../auxcontrol/service/impl/MeterDeviceServiceImpl.java | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java index feec7a0..4445fcb 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java @@ -32,9 +32,9 @@ public class AlgorithmClassComponentController { @GetMapping("/getAlgorithmClassComponentPage") @ApiOperation("算法关联主设备部件") - public ResponseResult getAlgorithmClassComponentPage(String algorithmId, Page page) { + public ResponseResult getAlgorithmClassComponentPage(String algorithmId,String stationCode, Page page) { Page algorithmClassComponentPage = - algorithmClassComponentService.getAlgorithmClassComponentPage(algorithmId, page); + algorithmClassComponentService.getAlgorithmClassComponentPage(algorithmId,stationCode, page); return ResponseResult.successData(algorithmClassComponentPage); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java index f862caf..36f8511 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java @@ -22,7 +22,7 @@ public interface IAlgorithmClassComponentService extends IService ***********************************/ - Page getAlgorithmClassComponentPage(String algorithmId, Page page); + Page getAlgorithmClassComponentPage(String algorithmId,String stationCode, Page page); /********************************** * 用途说明: 删除算法关联主设备部件 diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java index 1a67612..c591478 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java @@ -37,10 +37,11 @@ public class AlgorithmClassComponentServiceImpl extends ServiceImpl ***********************************/ @Override - public Page getAlgorithmClassComponentPage(String algorithmId, + public Page getAlgorithmClassComponentPage(String algorithmId, String stationCode, Page page) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AlgorithmClassComponent::getAlgorithmId, algorithmId); + queryWrapper.eq(AlgorithmClassComponent::getStationCode, stationCode); return this.page(page, queryWrapper); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java index 9381161..39b1c4c 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java @@ -45,14 +45,15 @@ public class MeterDeviceController { ***********************************/ @GetMapping("/page") @ApiOperation("分页查询变电站辅控设备") - public ResponseResult getDevicePage(String deviceName, String deviceModel, String deviceType, String status, + public ResponseResult getDevicePage(String stationId, String deviceName, String deviceModel, String deviceType, + String status, String systemcode, Page page) { //参数校验 系统编号不能为空 if (systemcode == null) { return ResponseResult.error("参数为空"); } //分页查询 - Page devicePage = meterDeviceService.getDevicePage(deviceName, deviceModel, deviceType, status, + Page devicePage = meterDeviceService.getDevicePage(stationId,deviceName, deviceModel, deviceType, status, systemcode, page); return ResponseResult.successData(devicePage); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java index a7b5317..a799fd3 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java @@ -27,7 +27,7 @@ public interface IMeterDeviceService extends IService { * 参数说明 page * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page ***********************************/ - Page getDevicePage(String deviceName, String deviceModel, String deviceType, String status, String systemcode, Page page); + Page getDevicePage(String stationId,String deviceName, String deviceModel, String deviceType, String status, String systemcode, Page page); /********************************** * 用途说明: 新增变电站辅控设备信息 diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java index d5a677a..b8f2a55 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java @@ -40,9 +40,10 @@ public class MeterDeviceServiceImpl extends ServiceImpl ***********************************/ @Override - public Page getDevicePage(String deviceName, String deviceModel, String deviceType, String status, + public Page getDevicePage(String stationId,String deviceName, String deviceModel, String deviceType, String status, String systemcode, Page page) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StrUtil.isNotBlank(stationId), MeterDevice::getStationId, stationId); queryWrapper.like(StrUtil.isNotBlank(deviceName), MeterDevice::getDeviceName, deviceName); queryWrapper.like(StrUtil.isNotBlank(deviceModel), MeterDevice::getDeviceModel, deviceModel); queryWrapper.eq(StrUtil.isNotBlank(deviceType), MeterDevice::getDeviceType, deviceType);