From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
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