From fa62ab9a0143433a5d058ab3229a37e4a9a0f696 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 20 六月 2023 14:16:46 +0800
Subject: [PATCH] Merge pull request #893 from sxh-netizen/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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 01d91a5..efbb24d 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,15 +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 org.springframework.util.DigestUtils;
import java.util.List;
@Service
public class UserServiceImpl implements IUserService {
-
+
@Autowired
private UserMapper userMapper;
@@ -58,10 +60,34 @@
@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;
+
+ List<User> users = userMapper.getUsers();
+ if (users.size() == 0) {
+ return false;
}
+ for (User user : users) {
+ if (user.getPushKey() == null) {
+ continue;
+ }
+ String checkStr = callId == null? user.getPushKey():(callId + "_" + user.getPushKey()) ;
+ System.out.println(checkStr);
+ String checkSign = DigestUtils.md5DigestAsHex(checkStr.getBytes());
+ if (checkSign.equals(sign)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @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