|
@@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.time.ZoneId;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -93,12 +95,30 @@ public class DatabackServiceImpl implements DatabackService {
|
|
|
condition = "day";
|
|
|
List<AttentionPoolStatisticsBo> list = new ArrayList<>();
|
|
|
if (condition != null){
|
|
|
- if (condition.equals("day"))
|
|
|
- list = attentionPoolStatisticsDao.selectAllByUserIdAndDay(userId);
|
|
|
- if (condition.equals("month"))
|
|
|
- list = attentionPoolStatisticsDao.selectAllByUserIdAndMonth(userId);
|
|
|
- if (condition.equals("year"))
|
|
|
- list = attentionPoolStatisticsDao.selectAllByUserIdAndYear(userId);
|
|
|
+ if (condition.equals("day")){
|
|
|
+ List<String> days = new ArrayList<>();
|
|
|
+ for (int i = 1;i <= 30;i++){
|
|
|
+ days.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).toString());
|
|
|
+ }
|
|
|
+// System.out.println(days);
|
|
|
+ list = attentionPoolStatisticsDao.selectAllByUserIdAndDay(userId,days);
|
|
|
+ }
|
|
|
+ if (condition.equals("month")){
|
|
|
+ List<String> months = new ArrayList<>();
|
|
|
+ for (int i = 0;i < 12;i++){
|
|
|
+ months.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")).toString());
|
|
|
+ }
|
|
|
+// System.out.println(months);
|
|
|
+ list = attentionPoolStatisticsDao.selectAllByUserIdAndMonth(userId,months);
|
|
|
+ }
|
|
|
+ if (condition.equals("year")){
|
|
|
+ List<String> years = new ArrayList<>();
|
|
|
+ for (int i = 0;i < 5;i++){
|
|
|
+ years.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")).toString());
|
|
|
+ }
|
|
|
+// System.out.println(years);
|
|
|
+ list = attentionPoolStatisticsDao.selectAllByUserIdAndYear(userId,years);
|
|
|
+ }
|
|
|
}
|
|
|
// List<AttentionPoolStatistics> list = attentionPoolStatisticsDao.searchAllByUserId(userId);
|
|
|
return list;
|