Commit 2a2a8a77 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

api token update

parent 0c42d076

escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java

+9 −8
Original line number Diff line number Diff line
@@ -58,15 +58,16 @@ public class AccessTokenService extends BaseService { 
    public Map<String, Object> queryAccessTokenList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {

        Map<String, Object> result = new HashMap<>(5);



        if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM, Constants.STATUS)) {

            return result;

        }



        Integer count = accessTokenMapper.countAccessTokenPaging(searchVal);



        PageInfo<AccessToken> pageInfo = new PageInfo<>(pageNo, pageSize);



        List<AccessToken> accessTokenList = accessTokenMapper.queryAccessTokenPaging(searchVal, pageInfo.getStart(), pageSize);

        Integer count;

        List<AccessToken> accessTokenList;

        if (loginUser.getUserType() == UserType.ADMIN_USER){

             count = accessTokenMapper.countAccessTokenPaging(0,searchVal);

            accessTokenList = accessTokenMapper.queryAccessTokenPaging(0,searchVal, pageInfo.getStart(), pageSize);

        }else {

            count = accessTokenMapper.countAccessTokenPaging(loginUser.getId(),searchVal);

            accessTokenList = accessTokenMapper.queryAccessTokenPaging(loginUser.getId(),searchVal, pageInfo.getStart(), pageSize);

        }



        pageInfo.setTotalCount(count);

        pageInfo.setLists(accessTokenList);

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java

+4 −2
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ public interface AccessTokenMapper { 
            @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE)

    })

    @SelectProvider(type = AccessTokenMapperProvider.class, method = "queryAccessTokenPaging")

    List<AccessToken> queryAccessTokenPaging(@Param("searchVal") String searchVal,

    List<AccessToken> queryAccessTokenPaging(@Param("userId") Integer userId,

                                             @Param("searchVal") String searchVal,

                                             @Param("offset") Integer offset,

                                             @Param("pageSize") Integer pageSize);
@@ -84,5 +85,6 @@ public interface AccessTokenMapper { 
     * @return

     */

    @SelectProvider(type = AccessTokenMapperProvider.class, method = "countAccessTokenPaging")

    Integer countAccessTokenPaging(@Param("searchVal") String searchVal);

    Integer countAccessTokenPaging(@Param("userId") Integer userId

                            ,@Param("searchVal") String searchVal);

}

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ public class AccessTokenMapperProvider { 
            FROM(TABLE_NAME + " t,t_escheduler_user u");

            Object searchVal = parameter.get("searchVal");

            WHERE("u.id = t.user_id");

            if(parameter.get("userId") != null && (int)parameter.get("userId") != 0){

                WHERE(" u.id = #{userId}");

            }

            if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){

                WHERE(" u.user_name like concat('%', #{searchVal}, '%')");

            }
@@ -115,6 +118,9 @@ public class AccessTokenMapperProvider { 
                FROM(TABLE_NAME + " t,t_escheduler_user u");

                Object searchVal = parameter.get("searchVal");

                WHERE("u.id = t.user_id");

                if(parameter.get("userId") != null && (int)parameter.get("userId") != 0){

                    WHERE(" u.id = #{userId}");

                }

                if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){

                    WHERE(" u.user_name like concat('%', #{searchVal}, '%') ");

                }