app消息推送

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

@@ -18,5 +18,5 @@ public interface UserRegistrationidMapper extends BaseMapper<UserRegistrationid>
 
     int addRegistrationID(UserRegistrationid userRegistrationid);
 
-    List<String> selectRegistrationID(@Param("userIdList") List<String> userIdList);
+    List<UserRegistrationid> selectRegistrationID(@Param("userIdList") List<String> userIdList);
 }

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

@@ -12,5 +12,5 @@ import java.util.List;
 public interface UserRegistrationidService extends IService<UserRegistrationid> {
     Integer addRegistrationID(UserRegistrationid userRegistrationid);
 
-    List<String> selectRegistrationID(List<String> userIdList);
+    List<UserRegistrationid> selectRegistrationID(List<String> userIdList);
 }

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

@@ -43,7 +43,7 @@ public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationi
     }
 
     @Override
-    public List<String> selectRegistrationID(List<String> userIdList) {
+    public List<UserRegistrationid> selectRegistrationID(List<String> userIdList) {
         return userRegistrationidMapper.selectRegistrationID(userIdList);
     }
 }

business-service/src/main/resources/mapper/service/UserRegistrationidMapper.xml

@@ -12,8 +12,8 @@
         where user_id = #{userId}
     </update>
 
-    <select id="selectRegistrationID" resultType="java.lang.String" parameterType="java.util.List">
-        select registration_id from user_registrationid where user_id in
+    <select id="selectRegistrationID" resultType="com.ozs.service.entity.UserRegistrationid" parameterType="java.util.List">
+        select * from user_registrationid where user_id in
         <foreach item="item" collection="userIdList" separator="," open="(" close=")" index="">
             #{item}
         </foreach>

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

@@ -6,10 +6,7 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAppPush;
-import com.ozs.service.entity.MsgWebPush;
+import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.MsgAlarmResp;
 import com.ozs.service.service.*;
 import com.ozs.system.service.ISysUserService;
@@ -168,14 +165,14 @@ public class WebSocketConteoller extends BaseController {
         List<MsgAppPush> msgAppPushList = msgAppPushService.list(lwMsgAppPush);
         log.info("APPmsgAppPushList     size -----" + msgAppPushList.size());
         if (StringUtils.isEmpty(msgAppPushList) || msgAppPushList.size() == 0) {
-            List<String> alias = new ArrayList<>();
+            List<UserRegistrationid> alias = new ArrayList<>();
             if (!StringUtils.isEmpty(userIdList) || userIdList.size() > 0) {
                 alias = userRegistrationidService.selectRegistrationID(userIdList);
             }
-            List<String> listString = distinct(alias);
-            if (!StringUtils.isEmpty(listString) || listString.size() > 0) {
-                for (String userid : listString) {
-                    log.info("APP  userid    -----" + userid);
+//            List<String> listString = distinct(alias);
+            if (!StringUtils.isEmpty(alias) || alias.size() > 0) {
+                for (UserRegistrationid userRegistrationid : alias) {
+                    log.info("APP  alias    -----" + userRegistrationid.getRegistrationId());
                     String pushId = UUID.randomUUID().toString();
                     msgAlarmResp.setPushId(UUID.randomUUID().toString());
                     String content = objStr(msgAlarmResp);
@@ -183,9 +180,9 @@ public class WebSocketConteoller extends BaseController {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String formatDate = sdf.format(alarmTime != null ? alarmTime : new Date());
                     log.info("APPcontent-----" + content);
-                    log.info("APPuserid-----" + userid);
+                    log.info("APPuserid-----" + userRegistrationid.getUserId());
                     List<String> userList = new ArrayList<>();
-                    userList.add(userid);
+                    userList.add(userRegistrationid.getRegistrationId());
                     JPushUtil.sendToRegistrationId(
                             userList,
                             "报警通知！", cameraName != null ? cameraName : "",
@@ -198,7 +195,7 @@ public class WebSocketConteoller extends BaseController {
                     msgAppPush.setStatus(1);
                     msgAppPush.setPushId(pushId);
                     msgAppPush.setAlarmId(alarmId);
-                    msgAppPush.setReceiveBy(userid);
+                    msgAppPush.setReceiveBy(userRegistrationid.getUserId());
                     msgAppPush.setCreateBy(userIdLogin);
                     msgAppPush.setCreateTime(new Date());
                     msgAppPush.setUpdateBy(userIdLogin);