diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java index 427b162..02ab52d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java @@ -58,7 +58,7 @@ List userClientList = responDeptProvider(deptMap.get("ownerDeptId")); sendJob(id, alarmJob, userClientList);//推送工单至app和pc端 if (StrUtil.isNotBlank(msg)) { - sendAlarm(msg, deptMap.get("deptid"), userClientList, alarmJob.getDevcode());//推送告警至app和pc端 + sendAlarm(id,msg, deptMap.get("deptid"), userClientList, alarmJob.getDevcode());//推送告警至app和pc端 } } } @@ -82,9 +82,9 @@ } } - private void sendAlarm(String msg, Long deptId, List clientIdlist, String devcode) { + private void sendAlarm(String jobId,String msg, Long deptId, List clientIdlist, String devcode) { List userIds = new ArrayList<>(); - String appMsg = "设备编号[" + devcode + "]发生" + msg; + String appMsg = "设备编号[" + devcode + "]发生" + msg+",工单编号为["+jobId+"]"; if (clientIdlist.size() > 0) { IPushResult pushResult = PushList.pushToUser(clientIdlist, "新的工单任务", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) {