From 66e67569095f0ba871c2b584ceed73dfaa50d00c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 12 七月 2022 16:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712

---
 src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 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 0a67a01..01d91a5 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
@@ -5,14 +5,16 @@
 import com.genersoft.iot.vmp.storager.dao.dto.User;
 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;
-    
-    
+
     @Override
     public User getUser(String username, String password) {
         return userMapper.select(username, password);
@@ -24,4 +26,42 @@
         user.setPassword(password);
         return userMapper.update(user) > 0;
     }
+
+    @Override
+    public User getUserByUsername(String username) {
+        return userMapper.getUserByUsername(username);
+    }
+
+    @Override
+    public int addUser(User user) {
+        User userByUsername = userMapper.getUserByUsername(user.getUsername());
+        if (userByUsername != null) {
+            return 0;
+        }
+        return userMapper.add(user);
+    }
+    @Override
+    public int deleteUser(int id) {
+        return userMapper.delete(id);
+    }
+
+    @Override
+    public List<User> getAllUsers() {
+        return userMapper.selectAll();
+    }
+
+    @Override
+    public int updateUsers(User user) {
+        return userMapper.update(user);
+    }
+
+
+    @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;
+        }
+    }
 }

--
Gitblit v1.8.0