feat(harmonic): 优化事件管理功能并调整日志级别
- 将多个模块的根日志级别从info调整为warn - 在CldEventParam中为幅值和持续时间字段添加更明确的描述 - 为CommonStatisticalQueryParam添加持续时间、特征幅值、严重度等范围验证参数 - 在CsEngineeringServiceImpl中添加排序功能支持 - 为设备交付相关参数和实体类添加治理方法、敏感用户、治理类型等新字段 - 在事件服务中实现持续时间、幅值、严重度等多维度筛选查询功能 - 为CsEventPO添加严重度字段并实现相关计算逻辑 - 优化事件列表查询性能,添加波形文件存在性过滤条件 - 更新XML映射文件以支持新的查询参数和字段映射 - 重构台账树构建逻辑,提升数据加载效率 - 修复数据查询中的大小写匹配问题
This commit is contained in:
@@ -111,4 +111,13 @@ public class CsEquipmentDeliveryAddParm implements Serializable {
|
||||
|
||||
@ApiModelProperty(value="是否支持升级(0:否 1:是)")
|
||||
private Integer upgrade;
|
||||
|
||||
@ApiModelProperty(value="治理方法")
|
||||
private String governMethod;
|
||||
|
||||
@ApiModelProperty(value="敏感用户id")
|
||||
private String monitorUser;
|
||||
|
||||
@ApiModelProperty(value="治理类型(稳态:harmonic 暂态:event)")
|
||||
private String governType;
|
||||
}
|
||||
@@ -116,4 +116,13 @@ public class CsEquipmentDeliveryAuditParm {
|
||||
|
||||
@ApiModelProperty(value="是否支持升级(0:否 1:是)")
|
||||
private Integer upgrade;
|
||||
|
||||
@ApiModelProperty(value="治理方法")
|
||||
private String governMethod;
|
||||
|
||||
@ApiModelProperty(value="敏感用户id")
|
||||
private String monitorUser;
|
||||
|
||||
@ApiModelProperty(value="治理类型(稳态:harmonic 暂态:event)")
|
||||
private String governType;
|
||||
}
|
||||
@@ -158,4 +158,28 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
|
||||
* 是否支持升级(0:否 1:是)
|
||||
*/
|
||||
private Integer upgrade;
|
||||
|
||||
/**
|
||||
* 治理方法
|
||||
*/
|
||||
@TableField(value = "govern_method")
|
||||
private String governMethod;
|
||||
|
||||
/**
|
||||
* 敏感用户id
|
||||
*/
|
||||
@TableField(value = "monitor_user")
|
||||
private String monitorUser;
|
||||
|
||||
/**
|
||||
* 治理类型(稳态:harmonic 暂态:event)
|
||||
*/
|
||||
@TableField(value = "govern_type")
|
||||
private String governType;
|
||||
|
||||
/**
|
||||
* 治理报告文件路径
|
||||
*/
|
||||
@TableField(value = "report_file_path")
|
||||
private String reportFilePath;
|
||||
}
|
||||
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
@@ -31,6 +30,9 @@ public class DataGroupEventVO {
|
||||
@ApiModelProperty("装置ID")
|
||||
private String deviceId;
|
||||
|
||||
@ApiModelProperty("设备网络码")
|
||||
private String nDid;
|
||||
|
||||
@ApiModelProperty("装置名称")
|
||||
private String devName;
|
||||
|
||||
@@ -65,7 +67,7 @@ public class DataGroupEventVO {
|
||||
private Double amplitude;
|
||||
|
||||
@ApiModelProperty("严重度")
|
||||
private String severity;
|
||||
private Double severity;
|
||||
|
||||
@ApiModelProperty("波形路径")
|
||||
private String wavePath;
|
||||
@@ -82,4 +84,7 @@ public class DataGroupEventVO {
|
||||
@ApiModelProperty("暂降源与监测位置关系 0-未知、1-上游、2-下游")
|
||||
private String sagSource;
|
||||
|
||||
@ApiModelProperty("监测点电压等级")
|
||||
private Double lineVoltage;
|
||||
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.njcn.csdevice.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -20,6 +21,9 @@ public class RecordAllDevTreeVo {
|
||||
@ApiModelProperty("设备名称")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty("设备状态")
|
||||
private Integer runStatus;
|
||||
|
||||
@ApiModelProperty("线路")
|
||||
private List<RecordAllLineTreeVo> children;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user