From 42155cb925930831293dd10ac5037c04619e92c9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 17 十月 2024 16:05:08 +0800 Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑,对于当天绑定(发现并绑定)的控制器,控制器计算的漏损量一定不正确,强制设置成0,本次修改是把原实现用发现日期时间控制,变成绑定日期时间控制。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java index 9a9f330..44a85ec 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java @@ -1,6 +1,9 @@ package com.dy.rtuMw.server.local.localProtocol; +import com.dy.common.util.*; import lombok.Data; + +import java.util.LinkedList; /** * @Author: liurunyu @@ -28,6 +31,10 @@ public Integer taskTreePoolTotalInstance = 0 ;//浠诲姟鏍戞睜浠诲姟瀹炰緥鎬绘暟 + public SysJvmUtil.JvmInfoVo jvmInfoVo ; + public SysMemoryUtil.MemInfoVo memInfoVo ; + public SysSysUtil.SysInfoVo sysInfoVo ; + public String toString(){ StringBuilder sb = new StringBuilder() ; sb.append("閫氫俊涓棿浠惰繍琛屼俊鎭�:\n"); @@ -45,6 +52,15 @@ sb.append(" 闀跨嚎绋嬫睜閰嶇疆鏈�澶х嚎绋嬫暟锛�" + longMaxThread + "\n"); sb.append(" 闀跨嚎绋嬫睜閰嶇疆鏈�灏忕嚎绋嬫暟锛�" + longMinThread + "\n"); sb.append(" 浠诲姟鏍戞睜浠诲姟瀹炰緥鎬绘暟锛�" + taskTreePoolTotalInstance + "\n"); + if(jvmInfoVo != null){ + sb.append(jvmInfoVo.toString()) ; + } + if(memInfoVo != null){ + sb.append(memInfoVo.toString()) ; + } + if(sysInfoVo != null){ + sb.append(sysInfoVo.toString()) ; + } sb.append("\n"); return sb.toString() ; -- Gitblit v1.8.0