From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/ram/Server_state.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Server_state.java b/gx_tieta/src/com/fgkj/dto/ram/Server_state.java
index 2ff1f2d..76eb23d 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Server_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Server_state.java
@@ -14,6 +14,15 @@
private Long free_disc_space;
private Integer db_conn_max;
private Integer db_conn_count;
+
+ private int app_conn_max; //涓荤▼搴忔暟鎹簱杩炴帴姹犳渶澶ц繛鎺ユ暟
+ private int app_busy_conn_cnt; //涓荤▼搴忔暟鎹簱杩炴帴姹犳鍦ㄤ娇鐢ㄧ殑杩炴帴鏁�
+ private int app_idle_conn_cnt; //涓荤▼搴忔暟鎹簱杩炴帴姹犵┖浣欒繛鎺ユ暟
+ private float server_cpu_rate; //鏈嶅姟鍣╟pu浣跨敤鐜�
+ private float server_network_rate;//鏈嶅姟鍣ㄧ綉缁滀娇鐢ㄧ巼
+
+ private String note;
+
public Server_state() {
super();
// TODO Auto-generated constructor stub
@@ -79,16 +88,53 @@
public void setDb_conn_count(Integer db_conn_count) {
this.db_conn_count = db_conn_count;
}
+ public int getApp_conn_max() {
+ return app_conn_max;
+ }
+ public void setApp_conn_max(int app_conn_max) {
+ this.app_conn_max = app_conn_max;
+ }
+ public int getApp_busy_conn_cnt() {
+ return app_busy_conn_cnt;
+ }
+ public void setApp_busy_conn_cnt(int app_busy_conn_cnt) {
+ this.app_busy_conn_cnt = app_busy_conn_cnt;
+ }
+ public int getApp_idle_conn_cnt() {
+ return app_idle_conn_cnt;
+ }
+ public void setApp_idle_conn_cnt(int app_idle_conn_cnt) {
+ this.app_idle_conn_cnt = app_idle_conn_cnt;
+ }
+ public float getServer_cpu_rate() {
+ return server_cpu_rate;
+ }
+ public void setServer_cpu_rate(float server_cpu_rate) {
+ this.server_cpu_rate = server_cpu_rate;
+ }
+ public float getServer_network_rate() {
+ return server_network_rate;
+ }
+ public void setServer_network_rate(float server_network_rate) {
+ this.server_network_rate = server_network_rate;
+ }
+ public String getNote() {
+ return note;
+ }
+ public void setNote(String note) {
+ this.note = note;
+ }
@Override
public String toString() {
- return "Server_state [num=" + num + ", server_version="
- + server_version + ", server_datetime=" + server_datetime
- + ", max_mem=" + max_mem + ", total_mem=" + total_mem
- + ", free_men=" + free_men + ", total_disc_space="
- + total_disc_space + ", free_disc_space=" + free_disc_space
- + ", db_conn_max=" + db_conn_max + ", db_conn_count="
- + db_conn_count + "]";
+ return "Server_state [num=" + num + ", server_version=" + server_version + ", server_datetime="
+ + server_datetime + ", max_mem=" + max_mem + ", total_mem=" + total_mem + ", free_men=" + free_men
+ + ", total_disc_space=" + total_disc_space + ", free_disc_space=" + free_disc_space + ", db_conn_max="
+ + db_conn_max + ", db_conn_count=" + db_conn_count + ", app_conn_max=" + app_conn_max
+ + ", app_busy_conn_cnt=" + app_busy_conn_cnt + ", app_idle_conn_cnt=" + app_idle_conn_cnt
+ + ", server_cpu_rate=" + server_cpu_rate + ", server_network_rate=" + server_network_rate + ", note="
+ + note + "]";
}
+
}
--
Gitblit v1.9.1