From 28450f858db096d02dab8e4d0c7041e3225a1be2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jun 2022 17:08:24 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/system/controller/LoginController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
index f084c2d..0ea9f5c 100644
--- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
+++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
@@ -6,10 +6,13 @@
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.service.ValidateCodeService;
import cc.mrbird.febs.common.utils.Md5Util;
+import cc.mrbird.febs.mall.mapper.MallAchieveRecordMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.monitor.entity.LoginLog;
import cc.mrbird.febs.monitor.service.ILoginLogService;
import cc.mrbird.febs.system.entity.User;
import cc.mrbird.febs.system.service.IUserService;
+import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.springframework.validation.annotation.Validated;
@@ -23,6 +26,7 @@
import javax.servlet.http.HttpSession;
import javax.validation.constraints.NotBlank;
import java.io.IOException;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -38,6 +42,8 @@
private final IUserService userService;
private final ValidateCodeService validateCodeService;
private final ILoginLogService loginLogService;
+ private final MallMemberMapper mallMemberMapper;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
@PostMapping("login")
@Limit(key = "login", period = 60, count = 10, name = "登录接口", prefix = "limit")
@@ -78,12 +84,18 @@
this.userService.updateLoginTime(username);
Map<String, Object> data = new HashMap<>(5);
// 获取系统访问记录
- Long totalVisitCount = this.loginLogService.findTotalVisitCount();
- data.put("totalVisitCount", totalVisitCount);
- Long todayVisitCount = this.loginLogService.findTodayVisitCount();
- data.put("todayVisitCount", todayVisitCount);
- Long todayIp = this.loginLogService.findTodayIp();
- data.put("todayIp", todayIp);
+// Long totalVisitCount = this.loginLogService.findTotalVisitCount();
+// data.put("totalVisitCount", totalVisitCount);
+// Long todayVisitCount = this.loginLogService.findTodayVisitCount();
+// data.put("todayVisitCount", todayVisitCount);
+// Long todayIp = this.loginLogService.findTodayIp();
+// data.put("todayIp", todayIp);
+
+ data.put("lastDay", mallAchieveRecordMapper.selectAchieveTotal("D", DateUtil.offsetDay(new Date(), -1)));
+ data.put("today", mallAchieveRecordMapper.selectAchieveTotal("D", new Date()));
+ data.put("lastMonth", mallAchieveRecordMapper.selectAchieveTotal("M", DateUtil.offsetMonth(new Date(), -1)));
+ data.put("thisMonth", mallAchieveRecordMapper.selectAchieveTotal("M", new Date()));
+
// 获取近期系统访问记录
List<Map<String, Object>> lastSevenVisitCount = this.loginLogService.findLastSevenDaysVisitCount(null);
data.put("lastSevenVisitCount", lastSevenVisitCount);
--
Gitblit v1.9.1