From 28df05e261c0d63050d0bd938b7a6a2c2938b8e9 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期六, 06 八月 2022 09:42:28 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
index 32b6ad6..f5dc7b0 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
@@ -3,14 +3,17 @@
import com.genersoft.iot.vmp.service.IUserService;
import com.genersoft.iot.vmp.storager.dao.UserMapper;
import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.util.List;
@Service
public class UserServiceImpl implements IUserService {
-
+
@Autowired
private UserMapper userMapper;
@@ -34,7 +37,9 @@
@Override
public int addUser(User user) {
User userByUsername = userMapper.getUserByUsername(user.getUsername());
- if (userByUsername != null) return 0;
+ if (userByUsername != null) {
+ return 0;
+ }
return userMapper.add(user);
}
@Override
@@ -53,4 +58,24 @@
}
+ @Override
+ public boolean checkPushAuthority(String callId, String sign) {
+ if (StringUtils.isEmpty(callId)) {
+ return userMapper.checkPushAuthorityByCallId(sign).size() > 0;
+ }else {
+ return userMapper.checkPushAuthorityByCallIdAndSign(callId, sign).size() > 0;
+ }
+ }
+
+ @Override
+ public PageInfo<User> getUsers(int page, int count) {
+ PageHelper.startPage(page, count);
+ List<User> users = userMapper.getUsers();
+ return new PageInfo<>(users);
+ }
+
+ @Override
+ public int changePushKey(int id, String pushKey) {
+ return userMapper.changePushKey(id,pushKey);
+ }
}
--
Gitblit v1.8.0