user返回个人信息和loginlogs更新
This commit is contained in:
parent
5fdda5bdb6
commit
941ae2d42a
@ -17,7 +17,6 @@ public class LoginLogsController {
|
|||||||
LoginLogsService loginLogsService;
|
LoginLogsService loginLogsService;
|
||||||
@RequestMapping("/getUserLoginLogs")
|
@RequestMapping("/getUserLoginLogs")
|
||||||
public List<LoginLogs> getUserLoginLog(LoginLogs loginLogs){
|
public List<LoginLogs> getUserLoginLog(LoginLogs loginLogs){
|
||||||
|
|
||||||
if (loginLogs==null){
|
if (loginLogs==null){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -26,6 +26,7 @@ import javax.websocket.Session;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
@ -192,7 +193,7 @@ public class UserController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
@RequestMapping("/getAllUsers")
|
@RequestMapping("/getAllUsers")
|
||||||
public HashMap<Integer,Object> getAllUsers(){
|
public List<User> getAllUsers(){
|
||||||
return userService.getAllUsers();
|
return userService.getAllUsers();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -227,4 +228,11 @@ public class UserController {
|
|||||||
// }
|
// }
|
||||||
// return userService.updateUserMessage(user);
|
// return userService.updateUserMessage(user);
|
||||||
// }
|
// }
|
||||||
|
@RequestMapping("/getUserDetailes")
|
||||||
|
public User getUserDetailes(User user){
|
||||||
|
if (user==null||user.getId()==null){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return userService.selectByUserId(user);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.*;
|
|||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
@Repository
|
@Repository
|
||||||
@ -28,8 +29,8 @@ public interface UserDao {
|
|||||||
User selectByUserLogin(String user_login);
|
User selectByUserLogin(String user_login);
|
||||||
|
|
||||||
int updateByEmail(User user);
|
int updateByEmail(User user);
|
||||||
@MapKey("id")
|
|
||||||
HashMap<Integer,Object> selectAllUsers();
|
List<User> selectAllUsers();
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3,6 +3,7 @@ package com.lovenav.service;
|
|||||||
import com.lovenav.entity.User;
|
import com.lovenav.entity.User;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
public interface UserService {
|
public interface UserService {
|
||||||
@ -16,7 +17,7 @@ public interface UserService {
|
|||||||
|
|
||||||
public int updatePassword(User user);
|
public int updatePassword(User user);
|
||||||
|
|
||||||
HashMap<Integer,Object> getAllUsers();
|
List<User> getAllUsers();
|
||||||
|
|
||||||
String updateUserMessage(User user);
|
String updateUserMessage(User user);
|
||||||
|
|
||||||
@ -24,4 +25,5 @@ public interface UserService {
|
|||||||
|
|
||||||
public User selectByUserId(User user);
|
public User selectByUserId(User user);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
|
||||||
@ -60,10 +61,9 @@ public class UserServiceImpl implements UserService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<Integer, Object> getAllUsers() {
|
public List<User> getAllUsers() {
|
||||||
HashMap<Integer, Object> map=new HashMap<>();
|
|
||||||
map=userDao.selectAllUsers();
|
return userDao.selectAllUsers();
|
||||||
return map;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -17,18 +17,17 @@
|
|||||||
from ln_login_logs
|
from ln_login_logs
|
||||||
where id = #{id,jdbcType=INTEGER}
|
where id = #{id,jdbcType=INTEGER}
|
||||||
</select>
|
</select>
|
||||||
<select id="selectAlreadyExist" resultType="com.lovenav.entity.LoginLogs">
|
<select id="selectAlreadyExist" resultMap="BaseResultMap" parameterType="java.lang.Integer">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from ln_login_logs
|
from ln_login_logs
|
||||||
where user_id = #{userId,jdbcType=INTEGER}
|
where user_id = #{userId,jdbcType=INTEGER}
|
||||||
</select>
|
</select>
|
||||||
<select id="getLoginLogs" resultType="com.lovenav.entity.LoginLogs">
|
<select id="getLoginLogs" resultMap="BaseResultMap" parameterType="java.lang.Integer">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from ln_login_logs
|
from ln_login_logs
|
||||||
where user_id = #{userId,jdbcType=INTEGER}
|
where user_id = #{userId,jdbcType=INTEGER}
|
||||||
order by login_time DESC
|
|
||||||
</select>
|
</select>
|
||||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
|
||||||
delete from ln_login_logs
|
delete from ln_login_logs
|
||||||
|
@ -190,7 +190,7 @@
|
|||||||
from ln_user
|
from ln_user
|
||||||
where user_login = #{user_login,jdbcType=VARCHAR}
|
where user_login = #{user_login,jdbcType=VARCHAR}
|
||||||
</select>
|
</select>
|
||||||
<select id="selectAllUsers" resultType="java.util.HashMap">
|
<select id="selectAllUsers" resultMap="BaseResultMap" >
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from ln_user
|
from ln_user
|
||||||
|
Loading…
Reference in New Issue
Block a user