From 3118a7626ca1ed836bf829cd7333f4e7af61ea0f Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Thu, 18 Apr 2019 15:22:31 +0800 Subject: [PATCH] api access token dev update --- .../java/cn/escheduler/api/service/AccessTokenService.java | 5 +++-- .../java/cn/escheduler/dao/mapper/AccessTokenMapper.java | 1 + .../cn/escheduler/dao/mapper/AccessTokenMapperProvider.java | 3 ++- .../java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java | 5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java index 418e44df46..4adde8ad60 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java @@ -111,6 +111,8 @@ public class AccessTokenService extends BaseService { accessToken.setUserId(userId); accessToken.setExpireTime(DateUtils.stringToDate(expireTime)); accessToken.setToken(token); + accessToken.setCreateTime(new Date()); + accessToken.setUpdateTime(new Date()); // insert int insert = accessTokenMapper.insert(accessToken); @@ -120,6 +122,7 @@ public class AccessTokenService extends BaseService { } else { putMsg(result, Status.CREATE_ALERT_GROUP_ERROR); } + return result; } @@ -173,8 +176,6 @@ public class AccessTokenService extends BaseService { accessToken.setToken(token); accessToken.setUpdateTime(new Date()); - - accessTokenMapper.update(accessToken); putMsg(result, Status.SUCCESS); diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java index b7d1df3fb0..aa196561b5 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java @@ -68,6 +68,7 @@ public interface AccessTokenMapper { @Results(value = {@Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER), @Result(property = "userId", column = "user_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER), @Result(property = "token", column = "token", javaType = String.class, jdbcType = JdbcType.VARCHAR), + @Result(property = "userName", column = "user_name", javaType = String.class, jdbcType = JdbcType.VARCHAR), @Result(property = "expireTime", column = "expire_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE), @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE), @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java index ffbd335b04..a2b69d5cc1 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java @@ -96,8 +96,9 @@ public class AccessTokenMapperProvider { SELECT("count(0)"); FROM(TABLE_NAME + " t,t_escheduler_user u"); Object searchVal = parameter.get("searchVal"); + WHERE("u.id = t.user_id"); if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){ - WHERE("u.id = t.user_id and u.user_name like concat('%', #{searchVal}, '%')"); + WHERE(" u.user_name like concat('%', #{searchVal}, '%')"); } }}.toString(); } diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java index cbebf7fdef..ad823a60ad 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java +++ b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java @@ -51,8 +51,9 @@ public class AccessTokenMapperTest { @Test public void testListPaging(){ - Integer integer = accessTokenMapper.countAccessTokenPaging("hw"); - List accessTokenList = accessTokenMapper.queryAccessTokenPaging("hw", 0, 2); + Integer integer = accessTokenMapper.countAccessTokenPaging(""); + System.out.println(integer); + List accessTokenList = accessTokenMapper.queryAccessTokenPaging("", 0, 2); System.out.println(accessTokenList); }