From 55f5271f893a25a7be671b24938e49976936a67b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 九月 2025 18:30:00 +0800
Subject: [PATCH] 新增Orgid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 98 insertions(+), 22 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..4aebae5 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,28 +1,34 @@
package com.ruoyi.web.controller.system;
-import com.alibaba.fastjson2.JSONObject;
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.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 com.smartor.service.impl.ServiceSLTDHealthcareRecordServiceImpl;
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.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -45,12 +51,26 @@
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private ISysConfigService sysConfigService;
+
@Value("${pri_key}")
private String pri_key;
@Value("${isEncryp}")
private Integer isEncryp;
+
+
+ @Value("${sltd_pub_path}")
+ private String sltdPubPath;
+
+
+ @Value("${spring.profiles.active}")
+ private String active;
+
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
/**
* 鐧诲綍鏂规硶
@@ -68,34 +88,70 @@
}
/**
- * 鍗曠偣鐧诲綍鏂规硶
+ * 鍗曠偣鐧诲綍鏂规硶(闇�瑕侀厤缃甀P鐧藉悕鍗�)
+ * 闇�瑕佸湪sys_config琛ㄧ殑sys.ip.whitelis涓紝鍔犲叆IP鎵嶈兘璁块棶璇ユ柟娉�
+ * <p>
+ * 鍙傛暟鍚屾椂涓虹┖锛屼笉缁欐煡璇㈡暟鎹�
+ * <p>
+ * 銆愬叆鍙傝鍒欍��
+ * 濡傛灉userName涓嶄负绌猴紝閭rgid涔熶笉鑳戒负绌�
+ * 濡傛灉涓婇潰涓や釜涓虹┖锛岄偅token涓嶈兘涓虹┖
*
- * @param loginBody 鍗曠偣鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @PostMapping("/SSOLogin")
- public AjaxResult SSOLogin(@RequestBody LoginBody loginBody) {
- AjaxResult ajax = AjaxResult.success();
+// @IpWhitelist
+ @GetMapping("/SSOLogin")
+ public RedirectView SSOLogin(@RequestParam(required = false) String userName, @RequestParam(required = false) String orgid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String token) {
+ if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
+ throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ log.info("--------杩涙柟娉曚簡鍚�?{}", token);
+ // 閲嶅畾鍚戝湴鍧�瀵硅薄(閲嶅畾鍚戝湴鍧�
+ RedirectView redirectView = new RedirectView();
+// if (active.equals("sltd")) {
+// Map<String, String> headers = buildRequestHeaders();
+// Map<String, String> requestParams = new HashMap<>();
+// requestParams.put("token", token);
+// String reqData = HttpUtil.postFormRequest(sltdPubPath + "/checkSsoTokenId", requestParams, headers, null);
+// log.info("銆�-----杩斿洖鐨勭粨鏋滀负銆戯細{}", reqData);
+// if (StringUtils.isEmpty(reqData)) {
+// throw new BaseException("token楠岃瘉澶辫触");
+// }
+//
+// Map<String, Object> map = JSONObject.parseObject(reqData, Map.class);
+// if (ObjectUtils.isEmpty(map) || (Integer) map.get("code") != 200) {
+// throw new BaseException("token楠岃瘉澶辫触");
+// }
+//
+// Map<String, Object> data = (Map<String, Object>) map.get("data");
+// //鍛樺伐缂栫爜
+// userName = (String) data.get("accountNo");
+// }
+ log.info("銆�-----------userName鐨勫�间负锛歿}銆�", userName);
// 鐢熸垚浠ょ墝
- if (StringUtils.isEmpty(loginBody.getUsername()) || StringUtils.isEmpty(loginBody.getOrgid())) {
- return AjaxResult.error("鐢ㄦ埛鍚嶆垨缁勭粐鏈烘瀯鎴栭儴闂ㄤ笉鑳戒负绌�");
+ if (StringUtils.isEmpty(userName) || StringUtils.isEmpty(orgid)) {
+ throw new BaseException("鐢ㄦ埛鍚嶆垨缁勭粐鏈烘瀯鎴栭儴闂ㄤ笉鑳戒负绌�");
+ }
+ if (isEncryp != null && isEncryp == 1) {
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
}
- if (StringUtils.isEmpty(loginBody.getDeptId())) {
- loginBody.setDeptId(null);
+ String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
+ if (StringUtils.isEmpty(token2)) {
+ throw new BaseException("鐧婚檰澶辫触");
}
- String userName = loginBody.getUsername();
- if (isEncryp == 1) {
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- userName = rsaPublicKeyExample.decryptedData(loginBody.getUsername(), pri_key);
+
+ String path = sysConfigService.selectConfigByKey("sys.qddz");
+ if (StringUtils.isEmpty(path)) {
+ throw new BaseException("璇烽厤缃墠绔湴鍧�");
}
- String token = loginService.loginByUserName(userName + "&" + loginBody.getOrgid() + "&" + loginBody.getDeptId());
- if (StringUtils.isEmpty(token)) {
- return AjaxResult.error("鐧婚檰澶辫触");
- }
- ajax.put(Constants.TOKEN, token);
- return ajax;
+ log.info("鍗曠偣鐧婚檰閲嶅畾鍚戝湴鍧�涓猴細{}", path + "/loginSSO?token=" + token2 + "&orgid=" + orgid + "&orgname=''" + "&ZuHuID=''&deptCode=''");
+ redirectView.setUrl(path + "/loginSSO?token=" + token2 + "&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 +181,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;
}
@@ -145,4 +213,12 @@
public AjaxResult getDept(@PathVariable String orgid) {
return AjaxResult.success(sysDeptService.selectDept(orgid));
}
+
+
+ private Map<String, String> buildRequestHeaders() {
+ Map<String, String> headers = new HashMap<>();
+// headers.put("Content-Type", "application/json");
+ headers.put("app-key", ServiceSLTDHealthcareRecordServiceImpl.APP_KEY);
+ return headers;
+ }
}
--
Gitblit v1.9.3