test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-02 20:08:40 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitee/dev' into dev

Browse Source
This commit is contained in:
bwcx_jzy 2019-08-21 22:25:00 -05:00
commit d9ffe55c5b
1 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
modules/agent/src/main/java/cn/keepbx/jpom/system/TopManager.java
View File

@ -98,43 +98,39 @@ public class TopManager {
String lastTime = "";
List<JSONObject> array = new ArrayList<>();
List<String> scale = new ArrayList<>();
JSONObject value = null;
while (cacheObjIterator.hasNext()) {
CacheObj<String, JSONObject> cacheObj = cacheObjIterator.next();
String key = cacheObj.getKey();
if (StrUtil.isNotEmpty(lastTime)) {
if (!key.equals(getLastTime(lastTime))) {
if (!key.equals(getNextScaleTime(lastTime))) {
array.clear();
scale.clear();
}
}
lastTime = key;
scale.add(key);
JSONObject value = cacheObj.getValue();
value = cacheObj.getValue();
array.add(value);
}
if (value != null) {
String time = value.getString("time");
//清除断开的监控数据
if (!getNextScaleTime(time).equals(getNowNextScale())) {
array.clear();
scale.clear();
}
}
int count = 24;
if (array.size() > count) {
array = array.subList(array.size() - count - 1, array.size() - 1);
}
while (scale.size() < count) {
if (scale.size() == 0) {
DateTime date = DateUtil.date();
int second = date.second();
if (second <= 30 && second > 0) {
second = 30;
} else if (second > 30) {
second = 0;
date = date.offset(DateField.MINUTE, 1);
}
String format = DateUtil.format(date, "HH:mm");
String secondStr = ":" + second;
if (second < 10) {
secondStr = ":0" + second;
}
scale.add(format + secondStr);
scale.add(getNowNextScale());
}
String time = scale.get(scale.size() - 1);
String newTime = getLastTime(time);
String newTime = getNextScaleTime(time);
scale.add(newTime);
}
JSONObject object = new JSONObject();
@ -143,7 +139,34 @@ public class TopManager {
return object;
}
private static String getLastTime(String time) {
/**
* 当前时间的下一个刻度
*
* @return String
*/
private static String getNowNextScale() {
DateTime date = DateUtil.date();
int second = date.second();
if (second <= 30 && second > 0) {
second = 30;
} else if (second > 30) {
second = 0;
date = date.offset(DateField.MINUTE, 1);
}
String format = DateUtil.format(date, "HH:mm");
String secondStr = ":" + second;
if (second < 10) {
secondStr = ":0" + second;
}
return format + secondStr;
}
/**
* 指定时间的下一个刻度
*
* @return String
*/
private static String getNextScaleTime(String time) {
DateTime dateTime = DateUtil.parseTime(time);
DateTime newTime = dateTime.offsetNew(DateField.SECOND, 30);
return DateUtil.formatTime(newTime);