tsurumure 10 місяців тому
батько
коміт
c2cf3ee027

+ 5 - 2
src/main/java/com/backendsys/modules/system/controller/SysUserV2Controller.java

@@ -1,10 +1,11 @@
 package com.backendsys.modules.system.controller;
 
 import com.backendsys.modules.common.utils.Result;
+import com.backendsys.modules.system.service.SysUserV2Service;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,12 +13,14 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "系统用户")
 public class SysUserV2Controller {
 
+    @Autowired
+    private SysUserV2Service sysUserV2Service;
 
     @Operation(summary = "获得系统用户详情")
     @GetMapping("/api/v2/system/user/getUserDetail")
     public Result getUserDetail(@Parameter(description = "用户ID") Long user_id) {
         System.out.println("user_id = " + user_id);
-        return Result.success();
+        return Result.success().put("data", sysUserV2Service.selectUserInfo(user_id));
     }
 
 }

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUserInfo.java

@@ -1,6 +1,7 @@
 package com.backendsys.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -11,7 +12,6 @@ public class SysUserInfo {
     @TableId(type = IdType.AUTO)
     private Long id;
     private Long user_id;
-    private Long unique_id;
     private String nickname;
     private String email;
     private Integer gender;

+ 4 - 0
src/main/java/com/backendsys/modules/system/service/SysUserV2Service.java

@@ -1,7 +1,11 @@
 package com.backendsys.modules.system.service;
 
 import com.backendsys.modules.system.entity.SysUser;
+import com.backendsys.modules.system.entity.SysUserInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface SysUserV2Service extends IService<SysUser> {
+
+    public SysUserInfo selectUserInfo(Long user_id);
+
 }

+ 19 - 0
src/main/java/com/backendsys/modules/system/service/impl/SysUserV2ServiceImpl.java

@@ -1,11 +1,30 @@
 package com.backendsys.modules.system.service.impl;
 
 import com.backendsys.modules.system.dao.SysUserDao;
+import com.backendsys.modules.system.dao.SysUserInfoDao;
 import com.backendsys.modules.system.entity.SysUser;
+import com.backendsys.modules.system.entity.SysUserInfo;
 import com.backendsys.modules.system.service.SysUserV2Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class SysUserV2ServiceImpl extends ServiceImpl<SysUserDao, SysUser> implements SysUserV2Service {
+
+    @Autowired
+    private SysUserDao sysUserDao;
+    @Autowired
+    private SysUserInfoDao sysUserInfoDao;
+
+    @Override
+    public SysUserInfo selectUserInfo(Long user_id) {
+        return sysUserInfoDao.selectOne(new LambdaQueryWrapper<SysUserInfo>().eq(SysUserInfo::getUser_id, user_id));
+//        QueryWrapper<SysUserInfo> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("user_id", user_id);
+//        return sysUserInfoDao.selectOne(queryWrapper);
+    }
+
 }

+ 9 - 8
src/main/java/com/backendsys/service/System/SysAuthServiceImpl.java

@@ -5,7 +5,6 @@ import com.backendsys.config.Redis.RedisCache;
 import com.backendsys.config.Security.service.TokenService;
 import com.backendsys.modules.system.dao.SysUserInfoDao;
 import com.backendsys.entity.System.SysUserDTO;
-import com.backendsys.modules.system.entity.SysUserInfo;
 import com.backendsys.exception.CustomException;
 import com.backendsys.service.SDKService.SDKTencent.SDKTencentSMSService;
 import com.backendsys.utils.CountUtil;
@@ -34,6 +33,7 @@ import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -191,13 +191,14 @@ public class SysAuthServiceImpl implements SysAuthService {
         stringRedisTemplate.opsForValue().set(tokenRedisKey, token, tokenDuration, TimeUnit.MILLISECONDS);
 
         // 6.[更新] 用户最后登录时间、登录IP
-        SysUserInfo userInfo = new SysUserInfo();
-        userInfo.setLast_login_ip(request.getRemoteAddr());
-        userInfo.setLast_login_uuid(uuid);
-        userInfo.setLast_login_time(DateUtil.now());
-        QueryWrapper<SysUserInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("user_id", userId);
-        sysUserInfoDao.update(userInfo, wrapper);
+        SysUserDTO sysUserLastlogin = new SysUserDTO();
+        sysUserLastlogin.setUser_id(userId);
+        sysUserLastlogin.setLast_login_ip(request.getRemoteAddr());
+        sysUserLastlogin.setLast_login_uuid(uuid);
+        LocalDateTime now = LocalDateTime.now();
+        String formattedDateTime = now.toString();
+        sysUserLastlogin.setLast_login_time(formattedDateTime);
+        sysUserMapper.updateUserInfo(sysUserLastlogin);
 
         // 7.[格式化] 将 Token 拼接到输出结果
         Map<String, Object> result = new LinkedHashMap<>(sysUserDetail);

+ 2 - 2
src/main/resources/application-local.yml

@@ -35,8 +35,8 @@ spring:
 
 
 springdoc:
-  #  swagger-ui:
-  #    path: /swagger-ui.html #自定义swagger-ui HTML文档路径
+  swagger-ui:
+    path: /swagger-ui.html #自定义swagger-ui HTML文档路径
   api-docs:
     path: /docs/api
     enabled: true

+ 2 - 2
src/main/resources/application-prod.yml

@@ -35,8 +35,8 @@ spring:
 
 
 springdoc:
-  #  swagger-ui:
-  #    path: /swagger-ui.html #自定义swagger-ui HTML文档路径
+  swagger-ui:
+    path: /swagger-ui.html #自定义swagger-ui HTML文档路径
   api-docs:
     path: /docs/api
     enabled: false

+ 2 - 0
src/main/resources/application.yml

@@ -32,6 +32,8 @@ spring:
 # MyBatis ORM
 #mybatis:
 mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: false
   global-config:
     banner: off
   mapper-locations: