消息推送

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

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
@@ -18,14 +16,12 @@ import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.mapper.MsgWebPushMapper;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
-import com.ozs.service.service.MsgAlarmFrequencyService;
 import com.ozs.service.service.MsgWebPushService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

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

@@ -84,7 +84,10 @@ public class WebSocketConteoller extends BaseController {
         // 推送消息reqMsgAlarmVo
         webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp));
         // app 消息推送
-        List<String> alias = userRegistrationidService.selectRegistrationID(userIdList);
+        List<String> alias = new ArrayList<>();
+        if (!StringUtils.isEmpty(userIdList) || userIdList.size() > 0) {
+            alias = userRegistrationidService.selectRegistrationID(userIdList);
+        }
         // List<String> alias = new ArrayList<String>();
         // alias.add("sunhh");
         if (!StringUtils.isEmpty(alias) || alias.size() > 0) {