manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化格式，秒后增加毫秒显示，补全显示天时分、时分秒毫秒

Browse Source
This commit is contained in:
thinkgem
2023-02-06 17:04:53 +08:00
parent 9485e59bc6
commit 38ed0fac97
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
common/src/main/java/com/jeesite/common/lang/TimeUtils.java
View File

@@ -19,14 +19,6 @@ public class TimeUtils {
public static final String[] AGO_CN = new String[] {"刚刚", "秒前", "分钟前", "小时前", "天前"}; public static final String[] AGO_CN = new String[] {"刚刚", "秒前", "分钟前", "小时前", "天前"};
public static final String[] AGO_EN = new String[] {"just now", " seconds ago", " minutes ago", " hours ago", " days ago"}; public static final String[] AGO_EN = new String[] {"just now", " seconds ago", " minutes ago", " hours ago", " days ago"};
/**
* 将毫秒数转换为：xx天，xx时，xx分，xx秒（v5.1 替换为 formatTime）
*/
@Deprecated
public static String formatDateAgo(long millisecond) {
return formatTime(millisecond, CN);
}
/** /**
* 将毫秒数转换为：xx天，xx时，xx分，xx秒 * 将毫秒数转换为：xx天，xx时，xx分，xx秒
*/ */
@@ -52,21 +44,33 @@ public class TimeUtils {
sb.append(ms).append(lang[0]); sb.append(ms).append(lang[0]);
} else { } else {
if (day > 0) { if (day > 0) {
ms -= day * dd;
sb.append(day).append(lang[4]); sb.append(day).append(lang[4]);
} }
if (hour > 0) { if (day > 0 || hour > 0) {
ms -= hour * hh;
sb.append(hour).append(lang[3]); sb.append(hour).append(lang[3]);
} }
if (minute > 0) { if (day > 0 || hour > 0 || minute > 0) {
ms -= minute * mi;
sb.append(minute).append(lang[2]); sb.append(minute).append(lang[2]);
} }
if (second > 0) { if (hour > 0 || minute > 0 || second > 0) {
sb.append(second).append(lang[1]); ms -= second * ss;
sb.append(second).append(".").append(ms).append(lang[1]);
} }
} }
return sb.toString(); return sb.toString();
} }
// /**
// * 将毫秒数转换为：xx天，xx时，xx分，xx秒（v5.1 替换为 formatTime）
// */
// @Deprecated
// public static String formatDateAgo(long millisecond) {
// return formatTime(millisecond, CN);
// }
/** /**
* 将过去的时间转为为，刚刚，xx秒，xx分钟，xx小时前、xx天前，大于3天的显示日期 * 将过去的时间转为为，刚刚，xx秒，xx分钟，xx小时前、xx天前，大于3天的显示日期
*/ */