From 2cfa20c70ea84fa3435f3fd1e653c5ae60a3fc1e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 06 一月 2026 16:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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..55d14d9 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}")
@@ -85,6 +88,18 @@
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid());
ajax.put(Constants.TOKEN, token);
return ajax;
+ }
+
+
+ /**
+ * 鐧诲綍鏂规硶
+ *
+ * @param loginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/test")
+ public void test(@RequestBody Map<String, Object> map) {
+ iServiceSLTDHealthcareRecordService.aa(map);
}
/**
@@ -136,7 +151,7 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
}
-
+ if (StringUtils.isEmpty(deptId)) deptId = "null";
String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
if (StringUtils.isEmpty(token2)) {
throw new BaseException("鐧婚檰澶辫触");
--
Gitblit v1.9.3