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 |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 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 2907535..5e9653a 100644
--- a/src/main/java/com/lf/server/service/sys/LoginService.java
+++ b/src/main/java/com/lf/server/service/sys/LoginService.java
@@ -23,14 +23,14 @@
 
     @Override
     public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
-        uname = StringHelper.isNull(uname) ? null : "%" + uname.trim() + "%";
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return loginMapper.selectCount(uname, type, start, end);
     }
 
     @Override
     public List<LoginEntity> selectByPage(String uname, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
-        uname = StringHelper.isNull(uname) ? null : "%" + uname.trim() + "%";
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return loginMapper.selectByPage(uname, type, start, end, limit, offset);
     }
@@ -70,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