From 47768d890fbfc1a5f3e93ca26137847361415e9e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 28 十月 2025 10:54:16 +0800
Subject: [PATCH] Merge branch 'master' into pim_meet
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index b246c23..b165f3e 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -1,12 +1,18 @@
package com.ruoyi.project.system.controller;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.service.ISysUserDeptService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginBody;
@@ -39,6 +45,12 @@
@Autowired
private TokenService tokenService;
+ @Autowired
+ private ISysUserDeptService userDeptService;
+
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
+
/**
* 鐧诲綍鏂规硶
*
@@ -61,11 +73,20 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @GetMapping("getInfo")
+ @GetMapping("/getInfo")
public AjaxResult getInfo()
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
+ // 鑾峰彇褰撳墠鐧诲綍鍏徃
+ Long tenantId = loginUser.getTenantId();
+ if(null != tenantId){
+ user.setTenantId(tenantId);
+ SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
+ if(!ObjectUtils.isEmpty(sysDept)){
+ user.setCurrentFactoryName(sysDept.getDeptName());
+ }
+ }
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -94,4 +115,44 @@
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus));
}
+
+ @PostMapping("/loginCheck")
+ public AjaxResult loginCheck(@RequestBody LoginBody loginBody)
+ {
+ try {
+ Long userId = loginService.loginCheck(loginBody.getUsername(), loginBody.getPassword());
+ return AjaxResult.success(userId);
+ }catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ @GetMapping("/userLoginFacotryList")
+ public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
+ List<SysUserDeptVo> sysUserDeptVoList = userDeptService.userLoginFacotryList(sysUserDeptVo);
+ Map<Long, SysUserDeptVo> map = sysUserDeptVoList.stream()
+ .collect(Collectors.toMap(
+ SysUserDeptVo::getDeptId,
+ item -> item,
+ (existing, replacement) -> existing // 濡傛灉閲嶅锛屼繚鐣欑涓�涓�
+ ));
+ List<SysUserDeptVo> uniqueList = new ArrayList<>(map.values());
+ return AjaxResult.success(uniqueList);
+ }
+
+ /**
+ * 閫夋嫨鍏徃鐧诲綍
+ *
+ * @param loginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/loginCheckFactory")
+ public AjaxResult loginCheckFactory(@RequestBody LoginBody loginBody)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ // 鐢熸垚浠ょ墝
+ String token = loginService.loginCheckFactory(loginBody.getUsername(), loginBody.getPassword(),loginBody.getFactoryId());
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
+ }
}
--
Gitblit v1.9.3