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:
chendaofei
2024-11-15 10:51:26 +08:00
parent ff205cb335
commit a6acf6d1c9
8 changed files with 572 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java
View File

@@ -64,5 +64,9 @@ public class TransientParam extends DeviceInfoParam.BusinessParam {
@ApiModelProperty("在线离线 0：在线 1：离线")
private Integer isType;
private String sortBy;
private String orderBy;
}

19
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
View File

@@ -301,8 +301,23 @@ public class TransientServiceImpl implements TransientService {
// 事件
.in(CollUtil.isNotEmpty(transientParam.getWaveType()), RmpEventDetailPO::getEventType, transientParam.getWaveType())
.in(CollUtil.isNotEmpty(transientParam.getEventReason()), RmpEventDetailPO::getAdvanceReason, transientParam.getEventReason())
.in(CollUtil.isNotEmpty(transientParam.getEventType()), RmpEventDetailPO::getAdvanceType, transientParam.getEventType())
.orderByDesc(RmpEventDetailPO::getStartTime);
.in(CollUtil.isNotEmpty(transientParam.getEventType()), RmpEventDetailPO::getAdvanceType, transientParam.getEventType());
if(StrUtil.isNotBlank(transientParam.getOrderBy())){
if(transientParam.getSortBy().equals("start_time")){
wrapper.orderBy(true,transientParam.getOrderBy().equals("asc"),RmpEventDetailPO::getStartTime);
}else if(transientParam.getSortBy().equals("feature_amplitude")){
wrapper.orderBy(true,transientParam.getOrderBy().equals("asc"),RmpEventDetailPO::getFeatureAmplitude);
}else if(transientParam.getSortBy().equals("firstMs")){
wrapper.orderBy(true,transientParam.getOrderBy().equals("asc"),RmpEventDetailPO::getFirstMs);
}else if(transientParam.getSortBy().equals("duration")){
wrapper.orderBy(true,transientParam.getOrderBy().equals("asc"),RmpEventDetailPO::getDuration);
}
}else {
wrapper.orderByDesc(RmpEventDetailPO::getStartTime);
}
//暂态幅值
if (Objects.nonNull(transientParam.getEventValueMin())) {
wrapper.ge(RmpEventDetailPO::getFeatureAmplitude, transientParam.getEventValueMin());