From 80e496eaef6ad23fbcc2b68b70422b7fc5e7568b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 08 十一月 2023 09:52:52 +0800
Subject: [PATCH] 完善Dao之Mapper,和pojo实体类代码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java |  135 +++++++++++++++++++++++++++++----------------
 1 files changed, 87 insertions(+), 48 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 957ef19..aead030 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -86,7 +86,7 @@
         try {
             //Boolean flag = cacheManager.getCacheNames().isEmpty() ;
             uuid = UUID.randomUUID().toString();
-            userPo = this.sv.login(uuid, vo.phone, vo.password);
+            userPo = this.sv.loginWithMapperXml(uuid, vo.phone, vo.password);
         } catch (Exception e) {
             log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -131,7 +131,7 @@
         try {
             //Boolean flag = cacheManager.getCacheNames().isEmpty() ;
             uuid = UUID.randomUUID().toString();
-            userPo = this.sv.login(uuid, vo.phone, vo.password);
+            userPo = this.sv.loginWithMapperXml(uuid, vo.phone, vo.password);
         } catch (Exception e) {
             log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -199,62 +199,22 @@
         BaUser userPo = this.sv.getByUuid(token) ;
         SsoVo vo = new SsoVo();
         if(userPo != null){
+            vo.dataSourceName = userPo.orgTag ;
             vo.logined = true ;
             vo.hasPower = false ;//榛樿鏄棤鏉冮檺
             if(userPo.supperAdmin != null && userPo.supperAdmin == 1){
                 vo.hasPower = true ;
             }else{
                 if(userPo.privileges != null && userPo.privileges.size() > 0){
-                    if(privilege != null && !privilege.trim().equals("")){
-                        int intPri = Integer.parseInt(privilege) ;
-                        for(Integer pri : userPo.privileges){
-                            if(pri == intPri){
-                                vo.hasPower = true ;
-                                break ;
-                            }
-                        }
-                    }else{
-                        if(allPrivilege != null && allPrivilege.length > 0){
-                            int intPri ;
-                            boolean ok = false ;
-                            boolean allOk = true ;
-                            for(String strPri : allPrivilege){
-                                intPri = Integer.parseInt(strPri) ;
-                                for(Integer pri : userPo.privileges){
-                                    if(pri == intPri){
-                                        ok = true ;
-                                        break ;
-                                    }
-                                }
-                                if(!ok){
-                                    allOk = false ;
-                                    break ;
-                                }
-                            }
-                            if(allOk){
-                                vo.hasPower = true ;
-                            }
-                        }else{
-                            int intPri ;
-                            if(anyPrivilege != null && anyPrivilege.length > 0){
-                                for(String strPri : anyPrivilege){
-                                    intPri = Integer.parseInt(strPri) ;
-                                    for(Integer pri : userPo.privileges){
-                                        if(pri == intPri){
-                                            vo.hasPower = true ;
-                                            break ;
-                                        }
-                                    }
-                                    if(vo.hasPower){
-                                        break ;
-                                    }
-                                }
-                            }
+                    vo.hasPower = this.hasOnePrivilege(privilege, userPo) ;
+                    if(!vo.hasPower){
+                        vo.hasPower = this.hasAllPrivilege(allPrivilege, userPo) ;
+                        if(!vo.hasPower){
+                            vo.hasPower = this.hasAnyPrivilege(anyPrivilege, userPo) ;
                         }
                     }
                 }
             }
-            vo.dataSourceName = userPo.getOrgTag() ;
         }else{
             vo.logined = false ;
             vo.hasPower = false ;
@@ -262,5 +222,84 @@
         return vo ;
     }
 
+    /////////////////////////////////////////////////////////////////
+    //
+    // 浠ヤ笅绉佹湁鏂规硶
+    //
+    /////////////////////////////////////////////////////////////////
+    /**
+     * 鍒ゆ柇鐧诲綍鐢ㄦ埛鏄惁鎷ユ湁鎸囧畾鐨勪竴涓潈闄�
+     * @param privilege 鎸囧畾鐨勪竴涓潈闄�
+     * @param userPo 褰撳墠鐧诲綍鐢ㄦ埛
+     * @return 鏄惁鏈夋潈闄�
+     */
+    private boolean hasOnePrivilege(String privilege, BaUser userPo){
+        boolean hasPrivilege  = false ;
+        if (privilege != null && !privilege.trim().equals("")) {
+            int intPri = Integer.parseInt(privilege);
+            for (Integer pri : userPo.privileges) {
+                if (pri == intPri) {
+                    hasPrivilege = true;
+                    break;
+                }
+            }
+        }
+        return hasPrivilege ;
+    }
+
+    /**
+     * 鍒ゆ柇鐧诲綍鐢ㄦ埛鏄惁鎷ユ湁鎸囧畾鐨勫涓潈闄�
+     * @param allPrivilege 鎸囧畾鐨勫涓潈闄�
+     * @param userPo 褰撳墠鐧诲綍鐢ㄦ埛
+     * @return 鏄惁鏈夋潈闄�
+     */
+    private boolean hasAllPrivilege(String[] allPrivilege, BaUser userPo){
+        boolean hasPrivilege  = false ;
+        if(allPrivilege != null && allPrivilege.length > 0){
+            int intPri ;
+            int count = 0 ;
+            for(String strPri : allPrivilege){
+                intPri = Integer.parseInt(strPri) ;
+                for(Integer pri : userPo.privileges){
+                    if(pri == intPri){
+                        count++ ;
+                        break ;
+                    }
+                }
+            }
+            if(count  == allPrivilege.length){
+                hasPrivilege = true ;
+            }
+        }
+        return hasPrivilege ;
+    }
+
+
+    /**
+     * 鍒ゆ柇鐧诲綍鐢ㄦ埛鏄惁鎷ユ湁鎸囧畾鐨勬煇涓潈闄�
+     * @param anyPrivilege 鎸囧畾鐨勫涓潈闄�
+     * @param userPo 褰撳墠鐧诲綍鐢ㄦ埛
+     * @return 鏄惁鏈夋潈闄�
+     */
+    private boolean hasAnyPrivilege(String[] anyPrivilege, BaUser userPo){
+        boolean hasPrivilege  = false ;
+        int intPri ;
+        if(anyPrivilege != null && anyPrivilege.length > 0){
+            for(String strPri : anyPrivilege){
+                intPri = Integer.parseInt(strPri) ;
+                for(Integer pri : userPo.privileges){
+                    if(pri == intPri){
+                        hasPrivilege = true ;
+                        break ;
+                    }
+                }
+                if(hasPrivilege){
+                    break ;
+                }
+            }
+        }
+        return hasPrivilege ;
+    }
+
 
 }

--
Gitblit v1.8.0