Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.增加国网上送标识

Browse Source 
2.修改国网上送定时任务
This commit is contained in:
wr
2024-03-13 15:05:52 +08:00
parent 4ed31bd4b1
commit 1192b87083
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java
View File

@@ -33,5 +33,9 @@ public class TerminalQueryParam extends BaseParam {
@ApiModelProperty(value = "是否上送国网监测点")
private Integer isUpToGrid;
@ApiModelProperty(value = "典型上送标识")
private Integer isUploadHead;
@ApiModelProperty(value = "主网上送标识")
private Integer monitorUploadStatus;
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
View File

@@ -222,6 +222,8 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
.eq(StrUtil.isNotBlank(baseParam.getMonitorState()), Monitor::getMonitorState, baseParam.getMonitorState())
.eq(StrUtil.isNotBlank(baseParam.getMonitorTag()), Monitor::getMonitorTag, baseParam.getMonitorTag())
.eq(Objects.nonNull(baseParam.getIsUpToGrid()), Monitor::getIsUpToGrid, baseParam.getIsUpToGrid())
.eq(Objects.nonNull(baseParam.getIsUploadHead()), Monitor::getIsUploadHead, baseParam.getIsUploadHead())
.eq(Objects.nonNull(baseParam.getMonitorUploadStatus()), Monitor::getMonitorUploadStatus, baseParam.getMonitorUploadStatus())
.and(StrUtil.isNotBlank(baseParam.getSearchValue()), i -> i.like(Monitor::getName, baseParam.getSearchValue())
.or()