From 19251fb5596415bfa83c51b8ed130ecbb31644ce Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 09 十月 2023 18:31:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 6990211..29210cf 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -1,6 +1,7 @@
package com.dsh.competition.controller;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -572,5 +573,56 @@
return sum;
}
+
+
+ @ResponseBody
+ @PostMapping("/base/competition/actPt")
+ public HashMap<String, Object> actPt(@RequestBody List<Integer> ids){
+ HashMap<String, Object> map = new HashMap<>();
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ ArrayList<Object> integers = new ArrayList<>();
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+ int year = DateUtil.year(new Date());
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ // 年
+ ArrayList<Integer> years = new ArrayList<>();
+ ArrayList<Integer> yearsUser = new ArrayList<>();
+ for (Object o : collect) {
+ String s = o.toString();
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, ids).like(UserCompetition::getInsertTime,s));
+ years.add(count);
+ yearsUser.add(count1);
+ }
+ map.put("yearData",years);
+ map.put("yearsUser",yearsUser);
+ // 月
+ ArrayList<Integer> months = new ArrayList<>();
+ ArrayList<Integer> monthsUser = new ArrayList<>();
+ for (int i = 1; i <= 12; i++) {
+ double sum=0.0;
+ String m=i+"";
+ if(i<10){
+ m="0"+i;
+ }
+ String s = year + "-" + m;
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, ids).like(UserCompetition::getInsertTime,s));
+ months.add(count);
+ monthsUser.add(count1);
+ }
+ map.put("monthData",months);
+ map.put("monthsUser",monthsUser);
+
+ return map;
+
+
+
+ }
+
}
--
Gitblit v1.7.1