diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java
index dd6ccf0..4450f49 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java
@@ -44,10 +44,10 @@ public class GatewayDeviceController {
      ***********************************/
     @GetMapping("/page")
     @ApiOperation("分页查询变电站网关设备")
-    public ResponseResult getGatewayDevicePage(String deviceName, String deviceModel, String deviceType,
+    public ResponseResult getGatewayDevicePage(String stationId,String deviceName, String deviceModel, String deviceType,
                                                String status, Page<GatewayDevice> page) {
         //分页查询
-        Page<GatewayDevice> deviceAlarmParameterPage = gatewayDeviceService.getGatewayDevicePage(deviceName,
+        Page<GatewayDevice> deviceAlarmParameterPage = gatewayDeviceService.getGatewayDevicePage(stationId,deviceName,
                 deviceModel, deviceType, status, page);
         return ResponseResult.successData(deviceAlarmParameterPage);
     }
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java
index 7a247c8..92fe765 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java
@@ -38,7 +38,7 @@ public class DeviceAlarmRecord implements Serializable {
     private String stationId;
 
     /**
-     * 所属系统：01-一次设备监控 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-视频系统 07-照明系统
+     * 所属系统：01-在线监测 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-辅控系统 07-照明系统
      */
     private String systemcode;
 
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceWorkData.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceWorkData.java
index caa9f6f..19388c3 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceWorkData.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceWorkData.java
@@ -34,7 +34,7 @@ public class DeviceWorkData implements Serializable {
     private String id;
 
     /**
-     * 所属系统：01-一次设备监控 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-视频系统 07-照明系统
+     * 所属系统：01-在线监测 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-辅控系统 07-照明系统
      */
     private String systemcode;
 
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDevice.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDevice.java
index 0748e44..df03f52 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDevice.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDevice.java
@@ -39,7 +39,7 @@ public class MeterDevice implements Serializable {
     private String stationId;
 
     /**
-     * 所属系统：01-一次设备监控 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-视频系统 07-照明系统
+     * 所属系统：01-在线监测 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-辅控系统 07-照明系统
      */
     private String systemcode;
 
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IGatewayDeviceService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IGatewayDeviceService.java
index 3e81883..f35e393 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IGatewayDeviceService.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IGatewayDeviceService.java
@@ -31,7 +31,7 @@ public interface IGatewayDeviceService extends IService<GatewayDevice> {
     * 参数说明 page
     * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.yfd.platform.modules.auxcontrol.domain.GatewayDevice>
     ***********************************/
-    Page<GatewayDevice> getGatewayDevicePage(String deviceName, String deviceModel, String deviceType, String status, Page<GatewayDevice> page);
+    Page<GatewayDevice> getGatewayDevicePage(String stationId,String deviceName, String deviceModel, String deviceType, String status, Page<GatewayDevice> page);
 
     /**********************************
     * 用途说明: 新增变电站网关设备
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java
index 5137e3f..12f6d3e 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java
@@ -61,10 +61,14 @@ public class GatewayDeviceServiceImpl extends ServiceImpl<GatewayDeviceMapper, G
     }
 
     @Override
-    public Page<GatewayDevice> getGatewayDevicePage(String deviceName, String deviceModel, String deviceType,
+    public Page<GatewayDevice> getGatewayDevicePage(String stationId, String deviceName, String deviceModel,
+                                                    String deviceType,
                                                     String status, Page<GatewayDevice> page) {
         //根据条件查询 变电站系统设备 分页查询变电站系统设备
         LambdaQueryWrapper<GatewayDevice> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(stationId)) {
+            queryWrapper.like(GatewayDevice::getStationId, stationId);
+        }
         //如果设备名称 deviceName不为空
         if (StringUtils.isNotEmpty(deviceName)) {
             queryWrapper.like(GatewayDevice::getDeviceName, deviceName);