From 19dde21187ef9edfdb38f60fbe764bddf3d2466d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 13 九月 2025 14:39:29 +0800
Subject: [PATCH] 登录用户没取科室病区
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 33a628c..75fd88e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,25 +1,30 @@
package com.ruoyi.web.controller.system;
-import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.annotation.IpWhitelist;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.dx.MessageSend;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
+import com.smartor.mapper.SysUserDeptMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.view.RedirectView;
-import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@@ -45,12 +50,18 @@
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private ISysConfigService sysConfigService;
+
@Value("${pri_key}")
private String pri_key;
@Value("${isEncryp}")
private Integer isEncryp;
+
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
/**
* 鐧诲綍鏂规硶
@@ -68,34 +79,37 @@
}
/**
- * 鍗曠偣鐧诲綍鏂规硶
+ * 鍗曠偣鐧诲綍鏂规硶(闇�瑕侀厤缃甀P鐧藉悕鍗�)
+ * 闇�瑕佸湪sys_config琛ㄧ殑sys.ip.whitelis涓紝鍔犲叆IP鎵嶈兘璁块棶璇ユ柟娉�
*
- * @param loginBody 鍗曠偣鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @PostMapping("/SSOLogin")
- public AjaxResult SSOLogin(@RequestBody LoginBody loginBody) {
- AjaxResult ajax = AjaxResult.success();
+ @IpWhitelist
+ @GetMapping("/SSOLogin")
+ public RedirectView SSOLogin(@RequestParam String userName, @RequestParam String orgid, @RequestParam(required = false) String deptId) {
+ RedirectView redirectView = new RedirectView();
// 鐢熸垚浠ょ墝
- if (StringUtils.isEmpty(loginBody.getUsername()) || StringUtils.isEmpty(loginBody.getOrgid())) {
- return AjaxResult.error("鐢ㄦ埛鍚嶆垨缁勭粐鏈烘瀯鎴栭儴闂ㄤ笉鑳戒负绌�");
+ if (StringUtils.isEmpty(userName) || StringUtils.isEmpty(orgid)) {
+ throw new BaseException("鐢ㄦ埛鍚嶆垨缁勭粐鏈烘瀯鎴栭儴闂ㄤ笉鑳戒负绌�");
}
-
- if (StringUtils.isEmpty(loginBody.getDeptId())) {
- loginBody.setDeptId(null);
- }
- String userName = loginBody.getUsername();
if (isEncryp == 1) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- userName = rsaPublicKeyExample.decryptedData(loginBody.getUsername(), pri_key);
+ userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
}
- String token = loginService.loginByUserName(userName + "&" + loginBody.getOrgid() + "&" + loginBody.getDeptId());
+ String token = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
if (StringUtils.isEmpty(token)) {
- return AjaxResult.error("鐧婚檰澶辫触");
+ throw new BaseException("鐧婚檰澶辫触");
}
- ajax.put(Constants.TOKEN, token);
- return ajax;
+ String path = sysConfigService.selectConfigByKey("sys.qddz");
+ if(StringUtils.isEmpty(path)){
+ throw new BaseException("璇烽厤缃墠绔湴鍧�");
+ }
+ log.info("鍗曠偣鐧婚檰閲嶅畾鍚戝湴鍧�涓猴細{}",path + "/loginSSO?token=" + token + "&orgid=" + orgid + "&orgname=''" + "&ZuHuID=''&deptCode=''");
+ redirectView.setUrl(path + "/loginSSO?token=" + token + "&orgid=" + orgid + "&orgname=null" + "&ZuHuID=null&deptCode=null");
+ redirectView.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
+ return redirectView;
}
+
@GetMapping("/getToken")
public void getToken(HttpServletResponse response) throws IOException {
@@ -125,6 +139,18 @@
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
+ List<SysUserDept> sysUserDeptKSs = null;
+ List<SysUserDept> sysUserDeptBQs = null;
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setUserId(user.getUserId());
+ sysUserDept.setDeptType("1");
+ sysUserDept.setOrgid(user.getOrgid());
+ sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ ajax.put("belongDepts", sysUserDeptKSs);
+ sysUserDept.setDeptType("2");
+ sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ ajax.put("belongWards", sysUserDeptBQs);
+
return ajax;
}
--
Gitblit v1.9.3