From 475d8e6e6becc86487aa30e1906bdc89d4acb23e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 30 五月 2019 09:53:22 +0800
Subject: [PATCH] 时间修正
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java
index 248adaa..790350b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.lang.reflect.Type;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -184,11 +185,21 @@
String desc = "";
if (value != null) {
// 鍒ゆ柇鏄惁鏄悓涓�澶�
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(value);
+ int y1 = calendar.get(Calendar.YEAR);//鑾峰彇骞翠唤
+ int d1 = calendar.get(Calendar.DAY_OF_YEAR);//鑾峰彇骞翠腑绗嚑澶�
+
+ Date nowDate = new Date();
+ Calendar calendar2 = Calendar.getInstance();
+ calendar2.setTime(nowDate);
+ int y2 = calendar2.get(Calendar.YEAR);//鑾峰彇骞翠唤
+ int d2 = calendar2.get(Calendar.DAY_OF_YEAR);//鑾峰彇骞翠腑绗嚑澶�
+
long old = value.getTime();
- long now = System.currentTimeMillis();
- long oldDay = old / (1000 * 60 * 60 * 24L);
- long nowDay = now / (1000 * 60 * 60 * 24L);
- if (oldDay == nowDay) {// 鍚屼竴澶�
+ long now = nowDate.getTime();
+ if (y1 == y2 && d1 == d2) {//鍒ゆ柇鏄笉鏄悓涓�骞寸殑鍚屼竴澶�
long cha = now - old;
if (cha < 1000 * 60 * 2L)
desc = "鍒氬垰";
@@ -196,10 +207,10 @@
desc = (cha / (1000 * 60)) + "鍒嗛挓鍓�";
else
desc = (cha / (1000 * 60 * 60)) + "灏忔椂鍓�";
- } else if (nowDay - oldDay == 1) {
+ } else if (d2 - d1 == 1) {
desc = "鏄ㄥぉ";
} else {
- desc = (nowDay - oldDay) + "澶╁墠";
+ desc = (d2 - d1) + "澶╁墠";
}
return new JsonPrimitive(desc);
}
--
Gitblit v1.8.0