数据看板3

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDashbordServiceImpl.java

@@ -17,23 +17,15 @@ import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
 import com.wwdz.ch.db.dao.distribution.DistributorProfitDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.dao.dts.DtsUserDao;
-import com.wwdz.ch.db.dto.request.distribution.CollectionShareRecordRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.DistributorProfitRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
-import com.xxdxxs.utils.DateUtils;
-import io.swagger.models.auth.In;
-import javafx.util.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Service;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 
@@ -77,8 +69,8 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
     public Result dataPanel(DataPanelRequestDto dto) {
         try {
             Pair<String, String> pair = TimeUtil.getAccessDate(dto.getType());
-            String startTimeStr = pair.getKey();
-            String endTimeStr = pair.getValue();
+            String startTimeStr = pair.getFirst();
+            String endTimeStr = pair.getSecond();
             logger.info("数据面板查询的时间范围 : {} - {}", startTimeStr, endTimeStr);
             DataPanelVo dataPanelVo = new DataPanelVo();
             //查询小程序访问数据
@@ -90,7 +82,7 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             } else {
                 key = "month";
             }
-            Result result = wxAppletApi.getAccessData(pair.getKey(), pair.getKey(), key);
+            Result result = wxAppletApi.getAccessData(startTimeStr, endTimeStr, key);
             if (result.getSuccess()) {
                 Map<String, Integer> map = (Map<String, Integer>) result.getData();
                 dataPanelVo.setVisitNum(map.get("visitUv"));

ch-core/src/main/java/com/wwdz/ch/core/consts/DashbordEnum.java

 package com.wwdz.ch.core.consts;
 
 import com.wwdz.ch.core.util.TimeUtil;
-import javafx.util.Pair;
-
-import java.util.function.Supplier;
+import org.springframework.data.util.Pair;
 
 public class DashbordEnum {
     /**

ch-core/src/main/java/com/wwdz/ch/core/util/TimeUtil.java

@@ -2,7 +2,7 @@ package com.wwdz.ch.core.util;
 
 import com.wwdz.ch.core.consts.DashbordEnum;
 import com.xxdxxs.utils.DateUtils;
-import javafx.util.Pair;
+import org.springframework.data.util.Pair;
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@@ -11,7 +11,6 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.function.Supplier;
 
 public final class TimeUtil {
 
@@ -52,7 +51,7 @@ public final class TimeUtil {
         calEnd.set(Calendar.DAY_OF_WEEK, calEnd.getFirstDayOfWeek() + 6);
         String beginDate = format.format(calStart.getTime());
         String endDate = format.format(calEnd.getTime());
-        return new Pair<>(beginDate, endDate);
+        return Pair.of(beginDate, endDate);
     }
 
     /**
@@ -69,7 +68,7 @@ public final class TimeUtil {
         calEnd.set(Calendar.DAY_OF_WEEK, calEnd.getFirstDayOfWeek() + 6);
         String beginDate = format.format(calStart.getTime());
         String endDate = format.format(calEnd.getTime());
-        return new Pair<>(beginDate, endDate);
+        return Pair.of(beginDate, endDate);
     }
 
     /**
@@ -85,7 +84,7 @@ public final class TimeUtil {
         calEnd.set(Calendar.DAY_OF_MONTH, calEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
         String beginDate = format.format(calStart.getTime());
         String endDate = format.format(calEnd.getTime());
-        return new Pair<>(beginDate, endDate);
+        return Pair.of(beginDate, endDate);
     }
 
 
@@ -100,7 +99,7 @@ public final class TimeUtil {
         calEnd.set(Calendar.DAY_OF_MONTH, calEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
         String beginDate = format.format(calStart.getTime());
         String endDate = format.format(calEnd.getTime());
-        return new Pair<>(beginDate, endDate);
+        return Pair.of(beginDate, endDate);
     }
 
     /**
@@ -113,7 +112,7 @@ public final class TimeUtil {
         calendar.add(Calendar.DATE, -1);
         String beginDate = format.format(calendar.getTime());
         String endDate = format.format(calendar.getTime());
-        return new Pair<>(beginDate, endDate);
+        return Pair.of(beginDate, endDate);
     }
 
 
@@ -124,9 +123,9 @@ public final class TimeUtil {
 
 
     public static void main(String[] args) {
-        Pair<String, String> pair = getAccessDate(4);
-        System.out.println(pair.getKey());
-        System.out.println(pair.getValue());
+        Pair<String, String> pair = getAccessDate(5);
+        System.out.println(pair.getFirst());
+        System.out.println(pair.getSecond());
     }
 
 }