From db7908a1783169130799652dd7253198ace964ac Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 13:47:15 +0800
Subject: [PATCH] server_state中加5列

---
 gx_tieta/src/com/fgkj/dto/ram/Server_state.java                               |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Server_stateImpl.class |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Server_state.class          |    0 
 gx_tieta/src/com/fgkj/dao/impl/ram/Server_stateImpl.java                      |    9 ++++++++-
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Server_stateImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Server_stateImpl.class
index 32b4eaf..5937a1f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Server_stateImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Server_stateImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Server_state.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Server_state.class
index bff1f95..895971c 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Server_state.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Server_state.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Server_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Server_stateImpl.java
index 1354eaa..75fbab8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Server_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Server_stateImpl.java
@@ -31,6 +31,12 @@
 				sstate.setFree_disc_space(rs.getLong("free_disc_space"));
 				sstate.setDb_conn_max(rs.getInt("db_conn_max"));
 				sstate.setDb_conn_count(rs.getInt("db_conn_count"));
+				
+				sstate.setApp_conn_max(rs.getInt("app_conn_max"));
+				sstate.setApp_busy_conn_cnt(rs.getInt("app_busy_conn_cnt"));
+				sstate.setApp_idle_conn_cnt(rs.getInt("app_idle_conn_cnt"));
+				sstate.setServer_cpu_rate(rs.getFloat("server_cpu_rate"));
+				sstate.setServer_network_rate(rs.getFloat("server_network_rate"));
 				list.add(sstate);
 			}
 		} catch (SQLException e) {
@@ -68,7 +74,8 @@
 	}
     //鏌ヨ绯荤粺鐨刢pu,鍐呭瓨浣跨敤鐜�
 	public List searchAll() {
-		String sql="select num,server_version,server_datetime,max_mem,total_mem,free_men,total_disc_space,free_disc_space,db_conn_max,db_conn_count from db_ram_db.tb_server_state";
+		String sql="select num,server_version,server_datetime,max_mem,total_mem,free_men,total_disc_space,free_disc_space,db_conn_max,db_conn_count"
+				+ ",app_conn_max,app_busy_conn_cnt,app_idle_conn_cnt,server_cpu_rate,server_network_rate from db_ram_db.tb_server_state";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new Server_stateImpl());
 		return list;
 	}
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..db3693f 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,13 @@
 	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;//鏈嶅姟鍣ㄧ綉缁滀娇鐢ㄧ巼
+	
 	public Server_state() {
 		super();
 		// TODO Auto-generated constructor stub
@@ -79,15 +86,44 @@
 	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;
+	}
 	@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 + "]";
 	}
 	
 

--
Gitblit v1.9.1