From b27d0ba5ab7a11ac6615e0cfee3cf428a7ae834f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 五月 2024 08:56:34 +0800
Subject: [PATCH] 完善代码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
index 6822356..6e6eb2d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
@@ -1,5 +1,6 @@
 package com.dy.sso.busi;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper;
 import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
 import com.dy.pipIrrGlobal.pojoBa.BaUser;
@@ -27,13 +28,46 @@
         this.baPrivilegeMapper = baPrivilegeMapper ;
     }
 
+
+    /**
+     * 闇�瑕丅aUserMapper.xml
+     * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
+     * @param phone 鐢ㄦ埛鎵嬫満鍙�
+     * @param password 鐢ㄦ埛瀵嗙爜
+     * @return 鐧诲綍鎴愬姛鐢ㄦ埛
+     */
     //褰撴湭娉ㄨВ@Transactional鏃讹紝浼氳緭鍑烘棩蹇楋細SqlSession [org.apache.ibatis.session.defaults.DefaultSqlSession@46727a0c] was not registered for synchronization because synchronization is not active
     @Transactional
     @Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
-    public BaUser login(String uuid, String phone, String password){
+    public BaUser loginWithMapperXml(String uuid, String phone, String password){
         BaUser baUser = this.baUserMapper.login(phone, password) ;
-        if(baUser !=  null  && baUser.id != null){
-            baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
+        if(baUser !=  null  && baUser.userId != null){
+            baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ;
+        }
+        return baUser;
+    }
+
+    /**
+     * 涓嶉渶瑕� BaUserMapper.xml
+     * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
+     * @param phone 鐢ㄦ埛鎵嬫満鍙�
+     * @param password 鐢ㄦ埛瀵嗙爜
+     * @return 鐧诲綍鎴愬姛鐢ㄦ埛
+     */
+    //褰撴湭娉ㄨВ@Transactional鏃讹紝浼氳緭鍑烘棩蹇楋細SqlSession [org.apache.ibatis.session.defaults.DefaultSqlSession@46727a0c] was not registered for synchronization because synchronization is not active
+    @Transactional
+    @Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
+    public BaUser loginWithOutMapperXml(String uuid, String phone, String password){
+        QueryWrapper<BaUser> qw = new QueryWrapper<>();
+        //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+        qw.select("id", "name", "phone", "orgTag", "supperAdmin")
+                .eq("disabled", 0)
+                .eq("deleted", 0)
+                .eq("phone", phone)
+                .eq("password", password);
+        BaUser baUser = this.baUserMapper.selectOne(qw) ;
+        if(baUser !=  null  && baUser.userId != null){
+            baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ;
         }
         return baUser;
     }
@@ -44,7 +78,7 @@
 
     @Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
     public BaUser getByUuid(String uuid){
-        //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻妤氫簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
+        //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻闄や簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
         return null ;
     }
 

--
Gitblit v1.8.0