|
|
@@ -100,6 +100,8 @@ public class WebSocketConteoller extends BaseController {
|
|
|
String pushId = UUID.randomUUID().toString();
|
|
|
msgAlarmResp.setPushId(pushId);
|
|
|
String content = objStr(msgAlarmResp);
|
|
|
+ log.info("WEBcontent-----" + content);
|
|
|
+ log.info("WEBuserid-----" + userid);
|
|
|
// 推送消息reqMsgAlarmVo
|
|
|
webSocketServer.sendOneMessage(userid, content);
|
|
|
|
|
|
@@ -136,8 +138,12 @@ public class WebSocketConteoller extends BaseController {
|
|
|
Date alarmTime = msgAlarm.getAlarmTime();
|
|
|
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);
|
|
|
+ List<String> userList = new ArrayList<>();
|
|
|
+ userList.add(userid);
|
|
|
JPushUtil.sendToRegistrationId(
|
|
|
- userid,
|
|
|
+ userList,
|
|
|
"报警通知！", cameraName != null ? cameraName : "",
|
|
|
// content,
|
|
|
formatDate + " " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + " " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + " " + mile + " " + endMile,
|
sunhh