推送

business-service/src/main/java/com/ozs/service/mapper/BaseUserMapper.java

@@ -13,24 +13,24 @@ import java.util.Set;
  */
 @Mapper
 public interface BaseUserMapper extends BaseMapper<BaseUser> {
-    
-    Set<String> getUserIdList(@Param("userId") String userId);
 
-    Set<String> getUserIdByDeptId(@Param("deptId") Long deptId);
+    List<String> getUserIdList(@Param("userId") String userId);
+
+    List<String> getUserIdByDeptId(@Param("deptId") Long deptId);
 
     List<Long> getDeptId(@Param("deptId") Long deptId);
 
-    Set<String> getUserIdByDeptIds(@Param("deptList") List<Long> deptList);
+    List<String> getUserIdByDeptIds(@Param("deptList") List<Long> deptList);
 
-    Set<String> getUserIdByDeptIdAndUserId(@Param("userId") String userId, @Param("deptId") Long deptId);
+    List<String> getUserIdByDeptIdAndUserId(@Param("userId") String userId, @Param("deptId") Long deptId);
 
-    Set<String> getUserIdListBy5(@Param("userId") String userId);
+    List<String> getUserIdListBy5(@Param("userId") String userId);
 
-    Set<String> getUserIdByDeptIdsBy5(@Param("deptList") List<Long> deptList);
+    List<String> getUserIdByDeptIdsBy5(@Param("deptList") List<Long> deptList);
 
-    Set<String> getUserIdList6();
-    
-    Set<String> getUserIdsList();
+    List<String> getUserIdList6();
+
+    List<String> getUserIdsList();
 
     BaseUser getUser(@Param("userId") String userId);
     

business-service/src/main/java/com/ozs/service/service/BaseUserService.java

@@ -13,7 +13,7 @@ import java.util.Set;
  */
 public interface BaseUserService extends IService<BaseUser> {
 
-    Set<String> getUserIdList(String createBy, Long deptId);
+    List<String> getUserIdList(String createBy, Long deptId);
 
     BaseUser getUser(String userId);
 

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -260,7 +260,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         // 数据权限 1：本人；2：本部门；3：本部门及下级部门；4：本人及本级部门；5：本人及本部门及下级部门；6：全部
         Integer dataPermission = baseUser.getDataPermission();
         Long deptId = baseUser.getDeptId();
-        Set<String> set = new HashSet<>();
+        List<String> set = new ArrayList<>();
         if (1 == dataPermission) {
             set = baseUserMapper.getUserIdList(userId);
         } else if (2 == dataPermission) {
@@ -274,11 +274,11 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             set = baseUserMapper.getUserIdByDeptIdAndUserId(userId, deptId);
         } else if (5 == dataPermission) {
             // 获取本人
-            Set<String> setUser = baseUserMapper.getUserIdListBy5(userId);
+            List<String> setUser = baseUserMapper.getUserIdListBy5(userId);
             // 获取部门数据
             List<Long> deptList5 = baseUserMapper.getDeptId(deptId);
             // 获取用户列表
-            Set<String> setUsers = baseUserMapper.getUserIdByDeptIdsBy5(deptList5);
+            List<String> setUsers = baseUserMapper.getUserIdByDeptIdsBy5(deptList5);
             set.addAll(setUser);
             set.addAll(setUsers);
         } else if (6 == dataPermission) {

business-service/src/main/java/com/ozs/service/service/impl/BaseUserServiceImpl.java

@@ -7,6 +7,7 @@ import com.ozs.service.service.BaseUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -20,36 +21,36 @@ public class BaseUserServiceImpl extends ServiceImpl<BaseUserMapper, BaseUser> i
     private BaseUserMapper baseUserMapper;
 
     @Override
-    public Set<String> getUserIdList(String createBy, Long deptId) {
-        Set<String> set = new HashSet<>();
+    public List<String> getUserIdList(String createBy, Long deptId) {
+        List<String> set = new ArrayList<>();
         // 根据create_by、data_permission=1(本人)
-        Set<String> set1 = baseUserMapper.getUserIdList(createBy);
+        List<String> set1 = baseUserMapper.getUserIdList(createBy);
         set.addAll(set1);
         // 根据 dept_id（本部门）data_permission=2
-        Set<String> set2 = baseUserMapper.getUserIdByDeptId(deptId);
+        List<String> set2 = baseUserMapper.getUserIdByDeptId(deptId);
         set.addAll(set2);
         // 根据 dept_id(本部门及下级部门数据) data_permission=3
         // 获取部门数据
         List<Long> deptList = baseUserMapper.getDeptId(deptId);
         // 获取用户列表
-        Set<String> set3 = baseUserMapper.getUserIdByDeptIds(deptList);
+        List<String> set3 = baseUserMapper.getUserIdByDeptIds(deptList);
         set.addAll(set3);
         // 本人及本级部门数据 data_permission=4
-        Set<String> set4 = baseUserMapper.getUserIdByDeptIdAndUserId(createBy, deptId);
+        List<String> set4 = baseUserMapper.getUserIdByDeptIdAndUserId(createBy, deptId);
         set.addAll(set4);
         // 本人及本部门及下级部门数据 data_permission=5
         // 获取本人
-        Set<String> setUser = baseUserMapper.getUserIdListBy5(createBy);
+        List<String> setUser = baseUserMapper.getUserIdListBy5(createBy);
         // 获取部门数据
         List<Long> deptList5 = baseUserMapper.getDeptId(deptId);
         // 获取用户列表
-        Set<String> setUsers = baseUserMapper.getUserIdByDeptIdsBy5(deptList5);
+        List<String> setUsers = baseUserMapper.getUserIdByDeptIdsBy5(deptList5);
         Set<String> set5 = new HashSet<>();
         set5.addAll(setUser);
         set5.addAll(setUsers);
         set.addAll(set5);
         // 全部 data_permission=6
-        Set<String> set6 = baseUserMapper.getUserIdList6();
+        List<String> set6 = baseUserMapper.getUserIdList6();
         set.addAll(set6);
         return set;
     }

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -63,10 +63,10 @@ public class WebSocketConteoller extends BaseController {
         log.info("baseCameraManagement-----"+baseCameraManagement);
         // 获取推送人ID列表
         log.info("publish-----"+baseCameraManagement.getCreateBy()+"-------------"+baseCameraManagement.getDeptId());
-        Set<String> set = baseUserService.getUserIdList(baseCameraManagement.getCreateBy(), baseCameraManagement.getDeptId());
+        List<String> set = baseUserService.getUserIdList(baseCameraManagement.getCreateBy(), baseCameraManagement.getDeptId());
         log.info("set-----"+set);
         String[] list = set.toArray(new String[set.size()]);
-        List<String> userIdList = new ArrayList<>(set);
+        // List<String> userIdList = new ArrayList<>(set);
         MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
         String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
         String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
@@ -95,8 +95,8 @@ public class WebSocketConteoller extends BaseController {
         webSocketServer.sendMoreMessage(list, content);
         // app 消息推送
         List<String> alias = new ArrayList<>();
-        if (!StringUtils.isEmpty(userIdList) || userIdList.size() > 0) {
-            alias = userRegistrationidService.selectRegistrationID(userIdList);
+        if (!StringUtils.isEmpty(set) || set.size() > 0) {
+            alias = userRegistrationidService.selectRegistrationID(set);
         }
         // List<String> alias = new ArrayList<String>();
         // alias.add("sunhh");
@@ -114,14 +114,14 @@ public class WebSocketConteoller extends BaseController {
                     content);
         }
         // 存入数据
-        if (!StringUtils.isEmpty(msgAlarm.getAlarmId()) || !StringUtils.isEmpty(userIdList)) {
+        if (!StringUtils.isEmpty(msgAlarm.getAlarmId()) || !StringUtils.isEmpty(set)) {
             String userIdLogin = "admin编码";
             SysUser user = userService.selectUserById(1L);
             if (!ObjectUtils.isEmpty(user)) {
                 userIdLogin = user.getUserId();
             }
             String alarmId = msgAlarm.getAlarmId();
-            for (String userId : userIdList) {
+            for (String userId : set) {
                 MsgWebPush msgWebPush = new MsgWebPush();
                 // 状态：1未读；2已读
                 msgWebPush.setStatus(1);