From 20a47729fc3349df5f08f17d1f8fd5b8db8dcb57 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 08 六月 2023 10:41:36 +0800 Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/service/IUserService.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/IUserService.java b/src/main/java/com/genersoft/iot/vmp/service/IUserService.java index 112af35..7e2a839 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IUserService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IUserService.java @@ -1,6 +1,7 @@ package com.genersoft.iot.vmp.service; import com.genersoft.iot.vmp.storager.dao.dto.User; +import com.github.pagehelper.PageInfo; import java.util.List; @@ -12,11 +13,17 @@ User getUserByUsername(String username); - void addUser(User user); + int addUser(User user); - void deleteUser(int id); + int deleteUser(int id); List<User> getAllUsers(); - void updateUsers(User user); + int updateUsers(User user); + + boolean checkPushAuthority(String callId, String sign); + + PageInfo<User> getUsers(int page, int count); + + int changePushKey(int id, String pushKey); } -- Gitblit v1.8.0