From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 84 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 8 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 45e5a2b..9d068ab 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,14 +1,20 @@
package com.ruoyi.web.controller.system;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Set;
import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.framework.web.domain.server.Sys;
+import com.ruoyi.system.service.ISysUserService;
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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -36,6 +42,9 @@
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private ISysUserService userService;
+
/**
* 鐧诲綍鏂规硶
*
@@ -45,13 +54,67 @@
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody)
{
- AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ System.out.println(loginBody);
+ String token = loginService.login(loginBody.getNickname(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
- ajax.put(Constants.TOKEN, token);
- return ajax;
+
+ HashMap<String, String> tokenMap = new HashMap<>();
+ tokenMap.put("token",token);
+ // tokenMap.put("roid",roid)
+ return AjaxResult.success(tokenMap);
}
+
+ /**
+ * 鐧诲綍鏂规硶锛堜笉闇�瑕侀獙璇佺爜锛�
+ *
+ * @param loginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/login/no")
+ public AjaxResult login2(@RequestBody LoginBody loginBody)
+ {
+ // 鐢熸垚浠ょ墝
+ String token = loginService.loginWithoutValidate(loginBody.getUsername(), loginBody.getPassword());
+ HashMap<String, String> tokenMap = new HashMap<>();
+ tokenMap.put("token",token);
+ return AjaxResult.success(tokenMap);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛褰撳墠鍓╀綑鐨勮瘯鐢ㄥぉ鏁�
+ */
+
+ @GetMapping("/leave")
+ public AjaxResult getUserLeave(){
+ Long userId = SecurityUtils.getUserId();
+ SysUser sysUser = userService.selectUserById(userId);
+ if(sysUser.getPaid()!=null&&sysUser.getPaid()==0) {
+ Date startTime = sysUser.getCreateTime();
+ // 瀹夊叏杞崲
+ Instant instant = startTime.toInstant();
+ LocalDateTime startDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
+ long daysPassed = ChronoUnit.DAYS.between(startDateTime, LocalDateTime.now());
+
+ return AjaxResult.success("璇曠敤鎻愰啋锛氭偍杩樻湁 " + (7L - daysPassed) + " 澶╃殑璇曠敤澶╂暟");
+ }else return AjaxResult.success("灏婃暚鐨勪細鍛樼敤鎴凤紝鎮ㄥソ锛佹杩庢潵鍒版湰鍢熷槦瀹剁綉");
+
+ }
+
+ /**
+ * 绠＄悊鍛樻巿浜堜細鍛�
+ */
+ @GetMapping("/member/{userId}")
+ public AjaxResult setMember(@PathVariable("userId") Long userId){
+ SysUser sysUser = userService.selectUserById(userId);
+ sysUser.setStatus("0");
+ sysUser.setPaid(1);
+ System.out.println("[{{{{{"+sysUser);
+ userService.updateUser(sysUser);
+
+ return AjaxResult.success(sysUser.getUserName() + " 鐢ㄦ埛宸叉垚涓轰細鍛�");
+ }
+
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
@@ -62,10 +125,13 @@
public AjaxResult getInfo()
{
SysUser user = SecurityUtils.getLoginUser().getUser();
+ // System.out.println(user);
+// System.out.println("===========0oiii999999999999999-000000000000000000");
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
Set<String> permissions = permissionService.getMenuPermission(user);
+ System.out.println(permissions);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
@@ -82,7 +148,9 @@
public AjaxResult getRouters()
{
Long userId = SecurityUtils.getUserId();
+ System.out.println("9222222222kkkkkkkkkkksssssssssssssssssss");
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);//杩欓噷涔嬪悗宸茬粡鐢熸垚浜嗘爲褰㈢粨鏋�
+ System.out.println(menus);
return AjaxResult.success(menuService.buildMenus(menus));//杩欓噷涔嬪悗灏卞皝瑁呭ソ浜嗗彂缁欏墠绔殑vo
}
}
--
Gitblit v1.9.1