소스 검색

getInfo 重写hot.json

lyhzzz 3 년 전
부모
커밋
4c15034b36
2개의 변경된 파일9개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 1
      src/main/java/com/cdf/controller/api/PageDataApiController.java
  2. 3 0
      src/main/java/com/cdf/util/DateUtil.java

+ 6 - 1
src/main/java/com/cdf/controller/api/PageDataApiController.java

@@ -49,14 +49,19 @@ public class PageDataApiController {
             pageData.setCdfCookieId(cookieId);
             pageData.setCdfCookieId(cookieId);
             pageData.setIsMiniApp(isMiniApp);
             pageData.setIsMiniApp(isMiniApp);
             pageData.setDay(DateUtil.getDay(new Date()));
             pageData.setDay(DateUtil.getDay(new Date()));
-            pageData.setInPageTime(DateUtil.getDateTime(new Date()));
             pageData.setUrl(whereUrl);
             pageData.setUrl(whereUrl);
         }else {
         }else {
             pageData = list.get(0);
             pageData = list.get(0);
         }
         }
         pageData.setUrl(whereUrl);
         pageData.setUrl(whereUrl);
         switch (type){
         switch (type){
+            case 0:
+                pageData.setInPageTime(DateUtil.getDateTime(new Date()));
+                break;
             case 1:
             case 1:
+                if(pageData.getInPageTime() == null){
+                    pageData.setInPageTime(DateUtil.getDay(new Date()));
+                }
                 pageData.setOutPageTime(DateUtil.getDateTime(new Date()));
                 pageData.setOutPageTime(DateUtil.getDateTime(new Date()));
                 long time = DateUtil.getDateTime(pageData.getInPageTime());
                 long time = DateUtil.getDateTime(pageData.getInPageTime());
                 pageData.setStopTime(new Date().getTime() - time );
                 pageData.setStopTime(new Date().getTime() - time );

+ 3 - 0
src/main/java/com/cdf/util/DateUtil.java

@@ -13,6 +13,9 @@ public class DateUtil {
     public static String getDay(Date date){
     public static String getDay(Date date){
         return new SimpleDateFormat(DAY_FORMAT).format(date);
         return new SimpleDateFormat(DAY_FORMAT).format(date);
     }
     }
+    public static String getFirstDay(Date date){
+        return new SimpleDateFormat(DAY_FORMAT).format(date)+" 00:00:00";
+    }
     public static String getDay(Date date,int day){
     public static String getDay(Date date,int day){
         Calendar calendar = Calendar.getInstance();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
         calendar.setTime(date);