From ddad878822a533390540349bb67b764073dd7309 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 10 十月 2023 15:33:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 112 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index ee41af0..ecf2190 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -464,6 +464,8 @@
return monthlyData;
}
+
+
/**
* 运营统计-平台-用户数据
*
@@ -474,6 +476,18 @@
return null;
+ }
+ @RequestMapping(value = "/getYears")
+ @ResponseBody
+ public Object getYears() {
+ ArrayList<Object> integers = new ArrayList<>();
+ int year = DateUtil.year(new Date());
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+
+ return collect;
}
/**
* 退费-平台
@@ -865,7 +879,36 @@
@RequestMapping(value = "/userAndVipPt")
@ResponseBody
public Object userAndVipPt(Integer type) {
+ type=1;
HashMap<String, Object> map = appUserClient.userAndVipPt(type);
+ return map;
+ }
+
+ @RequestMapping(value = "/stuPt")
+ @ResponseBody
+ public Object stuPt() {
+ HashMap<String, Object> map = appUserClient.stuPt();
+ return map;
+ }
+
+ @RequestMapping(value = "/coursePt")
+ @ResponseBody
+ public Object coursePt() {
+ List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(1));
+ HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
+ return map;
+ }
+
+ @RequestMapping(value = "/userAndVipYys")
+ @ResponseBody
+ public Object userAndVipYys(Integer id) {
+ HashMap<String, Object> map = appUserClient.userAndVipYys(id);
+ return map;
+ }
+ @RequestMapping(value = "/userAndVipStore")
+ @ResponseBody
+ public Object userAndVipStore(Integer id) {
+ HashMap<String, Object> map = appUserClient.userAndVipStore(id);
return map;
}
@RequestMapping(value = "/actPt")
@@ -875,10 +918,78 @@
HashMap<String, Object> map = competitionClient.actPt(userPt);
List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, 0));
+ long l1=0;
for (TStore tStore : list) {
long l = DateUtil.betweenDay(tStore.getCreateTime(), new Date(), true);
- tStore.getStartTime();
+ String startTime = tStore.getStartTime();
+ String endTime = tStore.getEndTime();
+ String s = startTime.split(":")[0];
+ String s1 = endTime.split(":")[1];
+ Integer integer = Integer.valueOf(s);
+ Integer integer1 = Integer.valueOf(s1);
+ Integer a =0;
+ if(integer==0 && integer1==0){
+ a=24;
+ }else {
+ a= integer1-integer;
+ }
+ l1 += l * a;
}
+ map.put("allHour",l1);
+ return map;
+ }
+ @RequestMapping(value = "/actYys")
+ @ResponseBody
+ public Object actYys(Integer id) {
+ List<Integer> userPt = appUserClient.getUserYYs(id);
+ HashMap<String, Object> map = competitionClient.actPt(userPt);
+
+ List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, 0));
+ long l1=0;
+ for (TStore tStore : list) {
+ long l = DateUtil.betweenDay(tStore.getCreateTime(), new Date(), true);
+ String startTime = tStore.getStartTime();
+ String endTime = tStore.getEndTime();
+ String s = startTime.split(":")[0];
+ String s1 = endTime.split(":")[1];
+ Integer integer = Integer.valueOf(s);
+ Integer integer1 = Integer.valueOf(s1);
+ Integer a =0;
+ if(integer==0 && integer1==0){
+ a=24;
+ }else {
+ a= integer1-integer;
+ }
+ l1 += l * a;
+ }
+ map.put("allHour",l1);
+ return map;
+ }
+ @RequestMapping(value = "/actStore")
+ @ResponseBody
+ public Object actStore(Integer id) {
+ List<Integer> userPt = appUserClient.getUserStore(id);
+ HashMap<String, Object> map = competitionClient.actPt(userPt);
+
+ List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, 0));
+ long l1=0;
+ for (TStore tStore : list) {
+ long l = DateUtil.betweenDay(tStore.getCreateTime(), new Date(), true);
+ String startTime = tStore.getStartTime();
+ String endTime = tStore.getEndTime();
+ String s = startTime.split(":")[0];
+ String s1 = endTime.split(":")[1];
+ Integer integer = Integer.valueOf(s);
+ Integer integer1 = Integer.valueOf(s1);
+ Integer a =0;
+ if(integer==0 && integer1==0){
+ a=24;
+ }else {
+ a= integer1-integer;
+ }
+ l1 += l * a;
+ }
+ map.put("allHour",l1);
return map;
}
--
Gitblit v1.7.1