消息推送

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

@@ -78,21 +78,25 @@ public class WebSocketConteoller extends BaseController {
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             msgAlarmResp.setImageUrls(objects);
         }
-        msgAlarmResp.setId(msgAlarm.getId());
+        if (!StringUtils.isEmpty(msgAlarm.getId())) {
+            msgAlarmResp.setId(msgAlarm.getId());
+        }
         // 推送消息reqMsgAlarmVo
         webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp));
         // app 消息推送
         List<String> alias = userRegistrationidService.selectRegistrationID(userIdList);
         // List<String> alias = new ArrayList<String>();
         // alias.add("sunhh");
-        Date alarmTime = msgAlarm.getAlarmTime();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formatDate = sdf.format(alarmTime != null ? alarmTime : new Date());
-        JPushUtil.sendToRegistrationId(
-                alias,
-                "报警通知！", cameraName != null ? cameraName : "",
-                formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + "     " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + "     " + mile + "     " + endMile,
-                "");
+        if (!StringUtils.isEmpty(alias) || alias.size() > 0) {
+            Date alarmTime = msgAlarm.getAlarmTime();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String formatDate = sdf.format(alarmTime != null ? alarmTime : new Date());
+            JPushUtil.sendToRegistrationId(
+                    alias,
+                    "报警通知！", cameraName != null ? cameraName : "",
+                    formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + "     " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + "     " + mile + "     " + endMile,
+                    "");
+        }
         // 存入数据
         if (!StringUtils.isEmpty(msgAlarm.getAlarmId()) || !StringUtils.isEmpty(userIdList)) {
             String userIdLogin = getUserId();
@@ -108,9 +112,11 @@ public class WebSocketConteoller extends BaseController {
                 msgWebPush.setUpdateBy(userIdLogin);
                 msgWebPush.setUpdateTime(new Date());
                 msgWebPushService.save(msgWebPush);
-                MsgAppPush msgAppPush = new MsgAppPush();
-                BeanUtils.copyProperties(msgWebPush, msgAppPush);
-                msgAppPushService.save(msgAppPush);
+                if (!StringUtils.isEmpty(alias) || alias.size() > 0) {
+                    MsgAppPush msgAppPush = new MsgAppPush();
+                    BeanUtils.copyProperties(msgWebPush, msgAppPush);
+                    msgAppPushService.save(msgAppPush);
+                }
             }
         }
         HashMap<String, Object> map = new HashMap<>();