From 11502c7f9f26edda0733c43a17b5b773ee8447e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 五月 2026 16:47:47 +0800
Subject: [PATCH] refactor(account): 财务模块更新
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 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 55f3caf..3334a07 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -7,8 +7,7 @@
import com.ruoyi.framework.security.service.SysLoginService;
import com.ruoyi.framework.security.service.SysPermissionService;
import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.domain.SysUser;
@@ -18,6 +17,7 @@
import com.ruoyi.project.system.service.ISysUserDeptService;
import com.ruoyi.project.system.service.ISysUserService;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +25,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -33,12 +32,12 @@
/**
* 鐧诲綍楠岃瘉
- *
+ *
* @author ruoyi
*/
@RestController
@AllArgsConstructor
-public class SysLoginController extends BaseController
+public class SysLoginController
{
private SysLoginService loginService;
private ISysMenuService menuService;
@@ -50,28 +49,28 @@
/**
* 鐧诲綍鏂规硶
- *
+ *
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
@PostMapping("/login")
- public R<?> login(@RequestBody LoginBody loginBody)
+ public AjaxResult login(@RequestBody LoginBody loginBody)
{
+ AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
- Map<String, Object> map = new HashMap<>();
- map.put(Constants.TOKEN, token);
- return R.ok(map);
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
}
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
- *
+ *
* @return 鐢ㄦ埛淇℃伅
*/
@GetMapping("/getInfo")
- public R<?> getInfo()
+ public AjaxResult getInfo()
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
@@ -93,40 +92,40 @@
loginUser.setPermissions(permissions);
tokenService.refreshToken(loginUser);
}
- Map<String, Object> map = new HashMap<>();
- map.put("user", user);
- map.put("aiEnabled", loginUser.getAiEnabled());
- map.put("roles", roles);
- map.put("permissions", permissions);
- return R.ok(map);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("user", user);
+ ajax.put("aiEnabled", loginUser.getAiEnabled());
+ ajax.put("roles", roles);
+ ajax.put("permissions", permissions);
+ return ajax;
}
/**
* 鑾峰彇璺敱淇℃伅
- *
+ *
* @return 璺敱淇℃伅
*/
@GetMapping("getRouters")
- public R<?> getRouters()
+ public AjaxResult getRouters()
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
- return R.ok(menuService.buildMenus(menus));
+ return AjaxResult.success(menuService.buildMenus(menus));
}
@PostMapping("/loginCheck")
- public R<?> loginCheck(@RequestBody LoginBody loginBody)
+ public AjaxResult loginCheck(@RequestBody LoginBody loginBody)
{
try {
Long userId = loginService.loginCheck(loginBody.getUsername(), loginBody.getPassword());
- return R.ok(userId);
+ return AjaxResult.success(userId);
}catch (Exception e) {
- return R.fail(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
}
@GetMapping("/userLoginFacotryList")
- public R<?> userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
+ public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
List<SysUserDeptVo> sysUserDeptVoList = userDeptService.userLoginFacotryList(sysUserDeptVo);
Map<Long, SysUserDeptVo> map = sysUserDeptVoList.stream()
.collect(Collectors.toMap(
@@ -135,7 +134,7 @@
(existing, replacement) -> existing // 濡傛灉閲嶅锛屼繚鐣欑涓�涓�
));
List<SysUserDeptVo> uniqueList = new ArrayList<>(map.values());
- return R.ok(uniqueList);
+ return AjaxResult.success(uniqueList);
}
/**
@@ -145,12 +144,12 @@
* @return 缁撴灉
*/
@PostMapping("/loginCheckFactory")
- public R<?> loginCheckFactory(@RequestBody LoginBody loginBody)
+ public AjaxResult loginCheckFactory(@RequestBody LoginBody loginBody)
{
+ AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
String token = loginService.loginCheckFactory(loginBody.getUsername(), loginBody.getPassword(),loginBody.getFactoryId());
- Map<String, Object> map = new HashMap<>();
- map.put(Constants.TOKEN, token);
- return R.ok(map);
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3