From b66ed691935b9369cb93c5397d562128591b09d7 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期五, 11 一月 2019 19:33:33 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Server_stateImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
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) {
--
Gitblit v1.9.1