From 4e3f740554673dee39e94d67540e1d9469912b43 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 10 一月 2019 10:33:39 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dto/ram/Server_state.java | 12 +++++++++++-
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 | 3 +++
4 files changed, 14 insertions(+), 1 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 5937a1f..e6c06f0 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 895971c..8c62409 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 75fbab8..3dd957e 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
@@ -4,6 +4,7 @@
import java.sql.SQLException;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import com.fgkj.dao.BaseDAO;
@@ -37,6 +38,8 @@
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"));
+
+ sstate.setNote(DAOHelper.sdf.format(new Date()));
list.add(sstate);
}
} catch (SQLException e) {
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 db3693f..76eb23d 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Server_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Server_state.java
@@ -21,6 +21,8 @@
private float server_cpu_rate; //鏈嶅姟鍣╟pu浣跨敤鐜�
private float server_network_rate;//鏈嶅姟鍣ㄧ綉缁滀娇鐢ㄧ巼
+ private String note;
+
public Server_state() {
super();
// TODO Auto-generated constructor stub
@@ -116,6 +118,12 @@
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="
@@ -123,8 +131,10 @@
+ ", 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 + "]";
+ + ", server_cpu_rate=" + server_cpu_rate + ", server_network_rate=" + server_network_rate + ", note="
+ + note + "]";
}
+
}
--
Gitblit v1.9.1