From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/service/sys/LoginService.java |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lf/server/service/sys/LoginService.java b/src/main/java/com/lf/server/service/sys/LoginService.java
index 7b18372..5e9653a 100644
--- a/src/main/java/com/lf/server/service/sys/LoginService.java
+++ b/src/main/java/com/lf/server/service/sys/LoginService.java
@@ -1,12 +1,14 @@
 package com.lf.server.service.sys;
 
 import com.lf.server.entity.sys.LoginEntity;
+import com.lf.server.helper.StringHelper;
 import com.lf.server.helper.WebHelper;
 import com.lf.server.mapper.sys.LoginMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -20,13 +22,17 @@
     LoginMapper loginMapper;
 
     @Override
-    public Integer selectCount(String userid) {
-        return loginMapper.selectCount(userid);
+    public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
+        uname = StringHelper.getLikeUpperStr(uname);
+
+        return loginMapper.selectCount(uname, type, start, end);
     }
 
     @Override
-    public List<LoginEntity> selectByPage(String userid, Integer limit, Integer offset) {
-        return loginMapper.selectByPage(userid, limit, offset);
+    public List<LoginEntity> selectByPage(String uname, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
+        uname = StringHelper.getLikeUpperStr(uname);
+
+        return loginMapper.selectByPage(uname, type, start, end, limit, offset);
     }
 
     @Override
@@ -64,15 +70,27 @@
         return loginMapper.selectLoginAll();
     }
 
-    public LoginEntity getNewLogin(int userid, int type, HttpServletRequest req) {
+    /**
+     * 鑾峰彇鏂扮殑鐧诲綍瀹炰綋绫�
+     */
+    public LoginEntity getNewLogin(int userid, int appId, int type, int status, HttpServletRequest req) {
         LoginEntity le = new LoginEntity();
-        le.setAppid(1);
+        le.setUserid(userid);
+        le.setAppid(appId);
         le.setIp(WebHelper.getIpAddress(req));
         le.setType(type);
-        le.setStatus(1);
-        le.setUserid(userid);
+        le.setStatus(status);
         le.setOptime(WebHelper.getCurrentTimestamp());
 
         return le;
     }
+
+    /**
+     * 鐢ㄦ埛鐧诲綍鐘舵��
+     * @return
+     */
+    @Override
+    public List<LoginEntity> selectLoginCounts(){
+        return loginMapper.selectLoginCounts();
+    }
 }

--
Gitblit v1.9.3