From cfd2989dae1dd52a7a1a631483161e65f811aeda Mon Sep 17 00:00:00 2001 From: Zhang Liguo <482370576@qq.com> Date: Mon, 25 Dec 2023 16:29:14 +0800 Subject: [PATCH] =?UTF-8?q?Loginlog=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LoginLogsController.java | 24 +++++++++++++++++++ .../lovenav/controller/UserController.java | 14 ++++++++--- .../java/com/lovenav/dao/LoginLogsDao.java | 8 +++++++ .../com/lovenav/service/LoginLogsService.java | 7 +++++- .../java/com/lovenav/service/UserService.java | 2 ++ .../serviceImpl/LoginLogsServiceImpl.java | 15 +++++++----- .../service/serviceImpl/UserServiceImpl.java | 14 +++++++++-- src/main/resources/mybatis/LoginLogsDao.xml | 9 ++++++- 8 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/lovenav/controller/LoginLogsController.java diff --git a/src/main/java/com/lovenav/controller/LoginLogsController.java b/src/main/java/com/lovenav/controller/LoginLogsController.java new file mode 100644 index 0000000..ea7dba8 --- /dev/null +++ b/src/main/java/com/lovenav/controller/LoginLogsController.java @@ -0,0 +1,24 @@ +package com.lovenav.controller; + +import cn.hutool.core.date.DateTime; +import com.lovenav.entity.LoginLogs; +import com.lovenav.service.LoginLogsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.HashMap; +@RestController +public class LoginLogsController { + @Autowired + LoginLogsService loginLogsService; + @RequestMapping("/getUserLoginLogs") + public HashMap getUserLoginLog(LoginLogs loginLogs){ + + if (loginLogs==null){ + return null; + } + return loginLogsService.getUserLoginLogs(loginLogs); + } +} diff --git a/src/main/java/com/lovenav/controller/UserController.java b/src/main/java/com/lovenav/controller/UserController.java index 70fb31c..dc891c7 100644 --- a/src/main/java/com/lovenav/controller/UserController.java +++ b/src/main/java/com/lovenav/controller/UserController.java @@ -197,11 +197,19 @@ public class UserController { } @RequestMapping("/updateUserDetails") - public String updateUserDetails(User user){ + public HashMap updateUserDetails(User user){ + + HashMap map=new HashMap<>(); if (user==null){ - return "用户不能为空！"; + map.put("msg","用户不能为空！"); + return map; } - return userService.updateUserMessage(user); + map.put("code",200); + map.put("msg",userService.updateUserMessage(user)); + + map.put("user",userService.selectByUserId(user)); + return map; + } @RequestMapping("/deleteUser") diff --git a/src/main/java/com/lovenav/dao/LoginLogsDao.java b/src/main/java/com/lovenav/dao/LoginLogsDao.java index db618a9..06a418f 100644 --- a/src/main/java/com/lovenav/dao/LoginLogsDao.java +++ b/src/main/java/com/lovenav/dao/LoginLogsDao.java @@ -1,8 +1,14 @@ package com.lovenav.dao; +import cn.hutool.core.date.DateTime; import com.lovenav.entity.LoginLogs; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.HashMap; + @Mapper @Repository public interface LoginLogsDao { @@ -21,4 +27,6 @@ public interface LoginLogsDao { LoginLogs selectAlreadyExist(int userId); int updateByUserId(LoginLogs record); + @MapKey("login_time") + public HashMapgetLoginLogs(Integer userId); } \ No newline at end of file diff --git a/src/main/java/com/lovenav/service/LoginLogsService.java b/src/main/java/com/lovenav/service/LoginLogsService.java index c0aa79a..5270ca0 100644 --- a/src/main/java/com/lovenav/service/LoginLogsService.java +++ b/src/main/java/com/lovenav/service/LoginLogsService.java @@ -1,9 +1,14 @@ package com.lovenav.service; +import cn.hutool.core.date.DateTime; import com.lovenav.entity.LoginLogs; +import java.security.Key; +import java.util.Date; +import java.util.HashMap; + public interface LoginLogsService { public String addLoginLogs(LoginLogs loginLogs); - + public HashMap getUserLoginLogs(LoginLogs loginLogs); } diff --git a/src/main/java/com/lovenav/service/UserService.java b/src/main/java/com/lovenav/service/UserService.java index 6df27f0..b9a6645 100644 --- a/src/main/java/com/lovenav/service/UserService.java +++ b/src/main/java/com/lovenav/service/UserService.java @@ -22,4 +22,6 @@ public interface UserService { String deleteUser(User user); + public User selectByUserId(User user); + } diff --git a/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java index 98e84f3..cef7039 100644 --- a/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java +++ b/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java @@ -1,5 +1,6 @@ package com.lovenav.service.serviceImpl; +import cn.hutool.core.date.DateTime; import com.lovenav.dao.LoginLogsDao; import com.lovenav.entity.LoginLogs; import com.lovenav.service.LoginLogsService; @@ -7,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashMap; @Service public class LoginLogsServiceImpl implements LoginLogsService { @@ -16,15 +18,16 @@ public class LoginLogsServiceImpl implements LoginLogsService { public String addLoginLogs(LoginLogs loginLogs) { Date date=new Date(); loginLogs.setLoginTime(date); - if (loginLogsDao.selectAlreadyExist(loginLogs.getUserId())==null){ if (loginLogsDao.insertSelective(loginLogs)!=1){ return "登录日志更新成功！"; } - }else { - if (loginLogsDao.updateByUserId(loginLogs)!=1){ - return "登录日志更新失败！"; - } - } return "更新登录日志失败"; } + + @Override + public HashMap getUserLoginLogs(LoginLogs loginLogs) { + HashMap map=new HashMap<>(); + map=loginLogsDao.getLoginLogs(loginLogs.getUserId()); + return map; + } } diff --git a/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java index 84659a9..d3499cd 100644 --- a/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java @@ -69,7 +69,7 @@ public class UserServiceImpl implements UserService { @Override public String updateUserMessage(User user) { if(userDao.updateByPrimaryKeySelective(user)==1){ - return "更新成功"; + return "更新成功!"; }else { return "更新失败！"; } @@ -85,6 +85,17 @@ public class UserServiceImpl implements UserService { } } + @Override + public User selectByUserId(User user) { + User user1; + user1=userDao.selectByPrimaryKey(user.getId()); + if (user1==null) { + return null; + }else { + return user1; + } + } + @Override public String sendEmailActivecode(User user, HashMapconfigMap) { return EmailUtils.sendEmail(user,configMap); @@ -107,7 +118,6 @@ public class UserServiceImpl implements UserService { @Override public User selectUserAlreadyExist(User user) { System.out.println(user.getUserEmail()); - User user1=userDao.selectByEmail(user.getUserEmail()); return user1; } diff --git a/src/main/resources/mybatis/LoginLogsDao.xml b/src/main/resources/mybatis/LoginLogsDao.xml index 6c2dfb7..3d9acd3 100644 --- a/src/main/resources/mybatis/LoginLogsDao.xml +++ b/src/main/resources/mybatis/LoginLogsDao.xml @@ -23,7 +23,14 @@ from ln_login_logs where user_id = #{userId,jdbcType=INTEGER} - + + delete from ln_login_logs where id = #{id,jdbcType=INTEGER}