diff --git a/src/main/java/com/lovenav/controller/LoginLogsController.java b/src/main/java/com/lovenav/controller/LoginLogsController.java index ea7dba8..2d92cf7 100644 --- a/src/main/java/com/lovenav/controller/LoginLogsController.java +++ b/src/main/java/com/lovenav/controller/LoginLogsController.java @@ -9,12 +9,14 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Date; import java.util.HashMap; +import java.util.List; + @RestController public class LoginLogsController { @Autowired LoginLogsService loginLogsService; @RequestMapping("/getUserLoginLogs") - public HashMap getUserLoginLog(LoginLogs loginLogs){ + public List getUserLoginLog(LoginLogs loginLogs){ if (loginLogs==null){ return null; diff --git a/src/main/java/com/lovenav/dao/LoginLogsDao.java b/src/main/java/com/lovenav/dao/LoginLogsDao.java index 06a418f..5d3102c 100644 --- a/src/main/java/com/lovenav/dao/LoginLogsDao.java +++ b/src/main/java/com/lovenav/dao/LoginLogsDao.java @@ -8,9 +8,11 @@ import org.springframework.stereotype.Repository; import java.util.Date; import java.util.HashMap; +import java.util.List; + -@Mapper @Repository +@Mapper public interface LoginLogsDao { int deleteByPrimaryKey(Integer id); @@ -27,6 +29,6 @@ public interface LoginLogsDao { LoginLogs selectAlreadyExist(int userId); int updateByUserId(LoginLogs record); - @MapKey("login_time") - public HashMapgetLoginLogs(Integer userId); + + public List getLoginLogs(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 5270ca0..080b51c 100644 --- a/src/main/java/com/lovenav/service/LoginLogsService.java +++ b/src/main/java/com/lovenav/service/LoginLogsService.java @@ -7,8 +7,9 @@ import com.lovenav.entity.LoginLogs; import java.security.Key; import java.util.Date; import java.util.HashMap; +import java.util.List; public interface LoginLogsService { public String addLoginLogs(LoginLogs loginLogs); - public HashMap getUserLoginLogs(LoginLogs loginLogs); + public List getUserLoginLogs(LoginLogs loginLogs); } diff --git a/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java index cef7039..73c7961 100644 --- a/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java +++ b/src/main/java/com/lovenav/service/serviceImpl/LoginLogsServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.HashMap; +import java.util.List; @Service public class LoginLogsServiceImpl implements LoginLogsService { @@ -25,9 +26,7 @@ public class LoginLogsServiceImpl implements LoginLogsService { } @Override - public HashMap getUserLoginLogs(LoginLogs loginLogs) { - HashMap map=new HashMap<>(); - map=loginLogsDao.getLoginLogs(loginLogs.getUserId()); - return map; + public List getUserLoginLogs(LoginLogs loginLogs) { + return loginLogsDao.getLoginLogs(loginLogs.getUserId()); } } diff --git a/src/main/resources/mybatis/LoginLogsDao.xml b/src/main/resources/mybatis/LoginLogsDao.xml index 3d9acd3..2a23404 100644 --- a/src/main/resources/mybatis/LoginLogsDao.xml +++ b/src/main/resources/mybatis/LoginLogsDao.xml @@ -23,7 +23,7 @@ from ln_login_logs where user_id = #{userId,jdbcType=INTEGER} - select from ln_login_logs