From 25ff2fc4ef2ad4bfccf6d2059d0159608ad71f8f Mon Sep 17 00:00:00 2001
From: ancienter <36272003+ancienter@users.noreply.github.com>
Date: 星期二, 09 四月 2024 09:52:23 +0800
Subject: [PATCH] Merge branch '648540858:master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/service/IUserService.java | 15 ++++++++++++---
1 files changed, 12 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
old mode 100644
new mode 100755
index 112af35..1e9b724
--- 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;
@@ -10,13 +11,21 @@
boolean changePassword(int id, String password);
+ User getUserById(int id);
+
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