From dcedb34de9910688533b8eab9f28ddd9e5873a31 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 07 八月 2024 16:08:09 +0800
Subject: [PATCH] 2024-08-07 朱宝民 欠费关阀改为余额不足关阀
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 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 52f85a0..b15cb61 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
@@ -7,7 +7,6 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
-import com.dy.pipIrrGlobal.util.DistrictLevel;
import com.dy.pipIrrGlobal.util.Org;
import com.mysql.cj.util.StringUtils;
import io.swagger.v3.oas.annotations.Hidden;
@@ -22,12 +21,10 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.cache.CacheManager;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
@@ -71,9 +68,9 @@
)
})
@GetMapping(path = "allOrg")
- public BaseResponse<List<Org>> allOrg(){
- List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
- return BaseResponseUtils.buildSuccess(list);
+ public BaseResponse<List<Org.OrgVo>> allOrg(){
+ //List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
+ return BaseResponseUtils.buildSuccess(Org.OrgList);
}
/**
@@ -107,7 +104,7 @@
}
if(!vo.phone.equals("admin")){
if(vo.phone.length() != 11){
- return BaseResponseUtils.buildFail("鎵嬫満鍙蜂笉姝ｇ‘");
+ return BaseResponseUtils.buildFail("鎵嬫満鍙凤紙闀垮害涓嶆槸11浣嶏級涓嶆纭�");
}
}
if(vo.orgTag == null || vo.orgTag.trim().length() == 0){
@@ -232,7 +229,27 @@
BaUser userPo = this.sv.getByUuid(token) ;
return userPo == null ? null : userPo.id ;
}
-
+ /**
+ * 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
+ * 鏂规硶鍔熻兘锛氶獙璇佹槸鍚﹀凡缁忕櫥褰�
+ * @param token 鐧诲綍鐢ㄦ埛token
+ * @return SsoVo
+ */
+ @Hidden
+ @GetMapping(path = "ssoCheck")
+ public SsoVo ssoCheck(String token){
+ BaUser userPo = this.sv.getByUuid(token) ;
+ SsoVo vo = new SsoVo();
+ if(userPo != null){
+ vo.dataSourceName = userPo.orgTag ;
+ vo.logined = true ;
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
+ }else{
+ vo.logined = false ;
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
+ }
+ return vo ;
+ }
/**
* 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
* 鏂规硶鍔熻兘锛氶獙璇佹槸鍚﹀凡缁忕櫥褰曪紝濡傛灉鐧诲綍浜嗭紝鍐嶉獙璇佹潈闄�
@@ -243,8 +260,8 @@
* @return SsoVo
*/
@Hidden
- @GetMapping(path = "ssoCheck")
- public SsoVo ssoCheck(String token, String privilege, String[] allPrivilege, String[] anyPrivilege){
+ @GetMapping(path = "ssoPowerCheck")
+ public SsoVo ssoPowerCheck(String token, String privilege, String[] allPrivilege, String[] anyPrivilege){
BaUser userPo = this.sv.getByUuid(token) ;
SsoVo vo = new SsoVo();
if(userPo != null){
@@ -276,6 +293,22 @@
return vo ;
}
+ /**
+ * 鑾峰緱褰撳墠鐧诲綍鐢ㄦ埛
+ * @param token 鐧诲綍鐢ㄦ埛token
+ * @return SsoVo
+ */
+ @Hidden
+ @GetMapping(path = "ssoCurUser")
+ public CurUserVo ssoCurUser(String token){
+ BaUser userPo = this.sv.getByUuid(token) ;
+ CurUserVo vo = new CurUserVo();
+ if(userPo != null){
+ vo.id = userPo.id ;
+ vo.name = userPo.userName;
+ }
+ return vo ;
+ }
/////////////////////////////////////////////////////////////////
//
// 浠ヤ笅绉佹湁鏂规硶
--
Gitblit v1.8.0