优化服务器列表查询速度、筛选条件bug修复。
ipv4、ipv6初始流量处理。 增加日志排查收益未自动生成问题。
This commit is contained in:
+2
@@ -64,7 +64,9 @@ public class RmMtrPolicyConfig extends BaseEntity
|
||||
/** 查询条件 */
|
||||
private String queryName;
|
||||
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
}
|
||||
|
||||
+2
-2
@@ -353,7 +353,7 @@ public class MessageHandler {
|
||||
boolean needUpdate = false;
|
||||
RmMtrClientRegistration updateData = new RmMtrClientRegistration();
|
||||
updateData.setId(rmMtrClientRegistration.getId());
|
||||
if(rmMtrClientRegistration.getLogicalNode() == null ||
|
||||
if((rmMtrClientRegistration.getLogicalNode() == null && heartbeat.getLogicalNode()!=null) ||
|
||||
!StringUtils.equals(rmMtrClientRegistration.getLogicalNode(), heartbeat.getLogicalNode())){
|
||||
updateData.setLogicalNode(heartbeat.getLogicalNode());
|
||||
needUpdate = true;
|
||||
@@ -371,7 +371,7 @@ public class MessageHandler {
|
||||
}
|
||||
needUpdate = true;
|
||||
}
|
||||
if(rmMtrClientRegistration.getCpucores() == null ||
|
||||
if((rmMtrClientRegistration.getCpucores() == null && heartbeat.getCpucores() != null) ||
|
||||
rmMtrClientRegistration.getCpucores() != heartbeat.getCpucores()){
|
||||
updateData.setCpucores(heartbeat.getCpucores());
|
||||
needUpdate = true;
|
||||
|
||||
Reference in New Issue
Block a user