From 459aa78c84cf552ebea6ef056d978c2531d71ac8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 三月 2026 17:14:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 110 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 31 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..fc8b79d 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,31 @@
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.utils.RSAPublicKeyExample;
+import com.ruoyi.common.exception.base.BaseException;
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.IServiceSLTDHealthcareRecordService;
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;
+import java.util.Map;
import java.util.Set;
/**
@@ -45,12 +48,13 @@
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private ISysConfigService sysConfigService;
+ @Autowired
+ private IServiceSLTDHealthcareRecordService iServiceSLTDHealthcareRecordService;
- @Value("${pri_key}")
- private String pri_key;
-
- @Value("${isEncryp}")
- private Integer isEncryp;
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
/**
* 鐧诲綍鏂规硶
@@ -62,40 +66,72 @@
public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid());
+ String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
ajax.put(Constants.TOKEN, token);
return ajax;
+ }
+
+
+ /**
+ * 鐧诲綍鏂规硶
+ *
+ * @param map 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/test")
+ public void test(@RequestBody Map<String, Object> map) {
+ iServiceSLTDHealthcareRecordService.aa(map);
}
/**
- * 鍗曠偣鐧诲綍鏂规硶
+ * 鍗曠偣鐧诲綍鏂规硶(闇�瑕侀厤缃甀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();
- // 鐢熸垚浠ょ墝
- if (StringUtils.isEmpty(loginBody.getUsername()) || StringUtils.isEmpty(loginBody.getOrgid())) {
- return AjaxResult.error("鐢ㄦ埛鍚嶆垨缁勭粐鏈烘瀯鎴栭儴闂ㄤ笉鑳戒负绌�");
+// @IpWhitelist
+ @GetMapping("/SSOLogin")
+ public RedirectView SSOLogin(@RequestParam(required = false) String userName,
+ @RequestParam(required = false) String orgid,
+ @RequestParam(required = false) String campusid,
+ @RequestParam(required = false) String deptId,
+ String token) {
+ if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
+ throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
}
- if (StringUtils.isEmpty(loginBody.getDeptId())) {
- loginBody.setDeptId(null);
+ String path = sysConfigService.selectConfigByKey("sys.qddz");
+ if (StringUtils.isEmpty(path)) {
+ throw new BaseException("璇烽厤缃墠绔湴鍧�");
}
- String userName = loginBody.getUsername();
- if (isEncryp == 1) {
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- userName = rsaPublicKeyExample.decryptedData(loginBody.getUsername(), pri_key);
+
+ String loginToken = loginService.ssoLogin(userName, orgid, deptId, campusid, token);
+ if (StringUtils.isEmpty(loginToken)) {
+ log.error("銆怱SO鐧诲綍銆戠櫥褰曞け璐ワ紝userName={}, orgid={}", userName, orgid);
+ return buildRedirect(path + "/login");
}
- String token = loginService.loginByUserName(userName + "&" + loginBody.getOrgid() + "&" + loginBody.getDeptId());
- if (StringUtils.isEmpty(token)) {
- return AjaxResult.error("鐧婚檰澶辫触");
- }
- ajax.put(Constants.TOKEN, token);
- return ajax;
+
+ String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&orgname=null&ZuHuID=null&deptCode=null";
+ log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
+ return buildRedirect(redirectUrl);
}
+
+ /**
+ * 鏋勫缓閲嶅畾鍚戣鍥�
+ */
+ private RedirectView buildRedirect(String url) {
+ RedirectView redirectView = new RedirectView();
+ redirectView.setUrl(url);
+ redirectView.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
+ return redirectView;
+ }
+
@GetMapping("/getToken")
public void getToken(HttpServletResponse response) throws IOException {
@@ -125,6 +161,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