ThbTech/SmartSubstationPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化台账逻辑

Browse Source
This commit is contained in:
weitang 2025-04-29 09:48:40 +08:00
parent 7699025441
commit 8625da00dd
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java
View File

@ -44,10 +44,10 @@ public class GatewayDeviceController {
***********************************/ ***********************************/
@GetMapping("/page") @GetMapping("/page")
@ApiOperation("分页查询变电站网关设备") @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) { String status, Page<GatewayDevice> page) {
//分页查询 //分页查询
Page<GatewayDevice> deviceAlarmParameterPage = gatewayDeviceService.getGatewayDevicePage(deviceName, Page<GatewayDevice> deviceAlarmParameterPage = gatewayDeviceService.getGatewayDevicePage(stationId,deviceName,
deviceModel, deviceType, status, page); deviceModel, deviceType, status, page);
return ResponseResult.successData(deviceAlarmParameterPage); return ResponseResult.successData(deviceAlarmParameterPage);
} }

2
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java
View File

@ -38,7 +38,7 @@ public class DeviceAlarmRecord implements Serializable {
private String stationId; private String stationId;
/** /**
* 所属系统：01-一次设备监控 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-视频系统 07-照明系统 * 所属系统：01-在线监测 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-辅控系统 07-照明系统
*/ */
private String systemcode; private String systemcode;

2
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceWorkData.java
View File

@ -34,7 +34,7 @@ public class DeviceWorkData implements Serializable {
private String id; private String id;
/** /**
* 所属系统：01-一次设备监控 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-视频系统 07-照明系统 * 所属系统：01-在线监测 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-辅控系统 07-照明系统
*/ */
private String systemcode; private String systemcode;

2
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDevice.java
View File

@ -39,7 +39,7 @@ public class MeterDevice implements Serializable {
private String stationId; private String stationId;
/** /**
* 所属系统：01-一次设备监控 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-视频系统 07-照明系统 * 所属系统：01-在线监测 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-辅控系统 07-照明系统
*/ */
private String systemcode; private String systemcode;

2
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IGatewayDeviceService.java
View File

@ -31,7 +31,7 @@ public interface IGatewayDeviceService extends IService<GatewayDevice> {
* 参数说明 page * 参数说明 page
* 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.yfd.platform.modules.auxcontrol.domain.GatewayDevice> * 返回值说明: 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);
/********************************** /**********************************
* 用途说明: 新增变电站网关设备 * 用途说明: 新增变电站网关设备

6
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java
View File

@ -61,10 +61,14 @@ public class GatewayDeviceServiceImpl extends ServiceImpl<GatewayDeviceMapper, G
} }
@Override @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) { String status, Page<GatewayDevice> page) {
//根据条件查询 变电站系统设备 分页查询变电站系统设备 //根据条件查询 变电站系统设备 分页查询变电站系统设备
LambdaQueryWrapper<GatewayDevice> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<GatewayDevice> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(stationId)) {
queryWrapper.like(GatewayDevice::getStationId, stationId);
}
//如果设备名称 deviceName不为空 //如果设备名称 deviceName不为空
if (StringUtils.isNotEmpty(deviceName)) { if (StringUtils.isNotEmpty(deviceName)) {
queryWrapper.like(GatewayDevice::getDeviceName, deviceName); queryWrapper.like(GatewayDevice::getDeviceName, deviceName);