Merge remote-tracking branch 'origin/master'

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<Object,Object> getUserLoginLog(LoginLogs loginLogs){
+
+        if (loginLogs==null){
+            return null;
+        }
+        return loginLogsService.getUserLoginLogs(loginLogs);
+    }
+}

src/main/java/com/lovenav/controller/UserController.java

@@ -197,11 +197,19 @@ public class UserController {
     }
 
     @RequestMapping("/updateUserDetails")
-    public String updateUserDetails(User user){
+    public HashMap<String,Object> updateUserDetails(User user){
+
+        HashMap<String,Object> 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")

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 HashMap<Object,Object>getLoginLogs(Integer userId);
 }

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<Object,Object> getUserLoginLogs(LoginLogs loginLogs);
 }

src/main/java/com/lovenav/service/UserService.java

@@ -22,4 +22,6 @@ public interface UserService {
 
     String deleteUser(User user);
 
+    public User selectByUserId(User user);
+
 }

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<Object, Object> getUserLoginLogs(LoginLogs loginLogs) {
+        HashMap<Object, Object> map=new HashMap<>();
+        map=loginLogsDao.getLoginLogs(loginLogs.getUserId());
+        return map;
+    }
 }

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, HashMap<String,String>configMap) {
         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;
     }

src/main/resources/mybatis/LoginLogsDao.xml

@@ -23,7 +23,14 @@
     from ln_login_logs
     where user_id = #{userId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <select id="getLoginLogs" resultType="java.util.HashMap">
+      select
+      <include refid="Base_Column_List" />
+      from ln_login_logs
+      where user_id = #{userId,jdbcType=INTEGER}
+      order by login_time DESC
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from ln_login_logs
     where id = #{id,jdbcType=INTEGER}
   </delete>