From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java
index 8f4187e..80fceb7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -51,24 +52,47 @@
public void write(JsonWriter out, Date value) throws IOException {
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 cha = now - old;
- if (cha < 1000 * 60 * 2L)
- desc = "鍒氬垰";
- else if (cha < 1000 * 60 * 60L)
- desc = (cha / (1000 * 60)) + "鍒嗛挓鍓�";
- else
- desc = (cha / (1000 * 60 * 60)) + "灏忔椂鍓�";
- } else if (nowDay - oldDay == 1) {
- desc = "鏄ㄥぉ";
+ long now = nowDate.getTime();
+ if (y1 == y2) {
+ if (d1 == d2) {
+ long cha = now - old;
+ if (cha < 1000 * 60 * 2L) {
+ desc = "鍒氬垰";
+ }else if (cha < 1000 * 60 * 60L) {
+ desc = (cha / (1000 * 60)) + "鍒嗛挓鍓�";
+ }else {
+ desc = (cha / (1000 * 60 * 60)) + "灏忔椂鍓�";
+ }
+ } else if (d2 - d1 == 1) {
+ desc = "鏄ㄥぉ";
+ } else {
+ desc = (d2 - d1) + "澶╁墠";
+ }
} else {
- desc = (nowDay - oldDay) + "澶╁墠";
+ int timeDistance = 0;
+ for (int i = y1; i < y2; i++) {
+ if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) {
+ timeDistance += 366; // 闂板勾
+ } else {
+ timeDistance += 365; // 涓嶆槸闂板勾
+ }
+ }
+ desc = timeDistance + (d2 - d1) + "澶╁墠";
}
+
out.value(desc);
}
}
--
Gitblit v1.8.0