From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 4aebae5..d51991f 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
@@ -16,6 +16,7 @@
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
import com.smartor.mapper.SysUserDeptMapper;
+import com.smartor.service.IServiceSLTDHealthcareRecordService;
import com.smartor.service.impl.ServiceSLTDHealthcareRecordServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,8 @@
@Autowired
private ISysConfigService sysConfigService;
+ @Autowired
+ private IServiceSLTDHealthcareRecordService iServiceSLTDHealthcareRecordService;
@Value("${pri_key}")
@@ -82,9 +85,21 @@
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 loginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/test")
+ public void test(@RequestBody Map<String, Object> map) {
+ iServiceSLTDHealthcareRecordService.aa(map);
}
/**
@@ -101,7 +116,7 @@
*/
// @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) {
+ public RedirectView SSOLogin(@RequestParam(required = false) String userName, @RequestParam(required = false) String orgid, @RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String token) {
if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
}
@@ -136,8 +151,8 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
}
-
- String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
+ if (StringUtils.isEmpty(deptId)) deptId = "null";
+ String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId + "&" + campusid);
if (StringUtils.isEmpty(token2)) {
throw new BaseException("鐧婚檰澶辫触");
}
--
Gitblit v1.9.3