diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index a749516..4c2ca2b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -80,7 +80,8 @@ List clientIds = new ArrayList<>(); if (StrUtil.isNotEmpty(clientId)) { clientIds.add(clientId); - IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", "您有一条工单超时未处理"); + String appMsg="您有一条编号为["+id+"]的工单未处理,请及时处理"; + IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未处理工单推送成功:" + id.toString()); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index a749516..4c2ca2b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -80,7 +80,8 @@ List clientIds = new ArrayList<>(); if (StrUtil.isNotEmpty(clientId)) { clientIds.add(clientId); - IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", "您有一条工单超时未处理"); + String appMsg="您有一条编号为["+id+"]的工单未处理,请及时处理"; + IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未处理工单推送成功:" + id.toString()); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index c41f9de..b834069 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -70,7 +70,8 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (userClientList.size() > 0) { - IPushResult pushResult = PushList.pushToUser(userClientList, "工单提醒", "您有一条工单超时未接收"); + String appMsg="您有一条编号为["+id+"]的工单未处理,请及时处理"; + IPushResult pushResult = PushList.pushToUser(userClientList, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index a749516..4c2ca2b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -80,7 +80,8 @@ List clientIds = new ArrayList<>(); if (StrUtil.isNotEmpty(clientId)) { clientIds.add(clientId); - IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", "您有一条工单超时未处理"); + String appMsg="您有一条编号为["+id+"]的工单未处理,请及时处理"; + IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未处理工单推送成功:" + id.toString()); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index c41f9de..b834069 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -70,7 +70,8 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (userClientList.size() > 0) { - IPushResult pushResult = PushList.pushToUser(userClientList, "工单提醒", "您有一条工单超时未接收"); + String appMsg="您有一条编号为["+id+"]的工单未处理,请及时处理"; + IPushResult pushResult = PushList.pushToUser(userClientList, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index ce6b82f..bdae77d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -50,15 +50,12 @@ @RequestMapping(value = "/alarmNow") @ResponseBody public Object alarmNow() { - // 查询当前有效的报警记录(status=1) DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope); - SuccessResponseData successResult = new SuccessResponseData(); successResult.setData(alarmNowViewList); successResult.setMessage("success"); - return successResult; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index a749516..4c2ca2b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -80,7 +80,8 @@ List clientIds = new ArrayList<>(); if (StrUtil.isNotEmpty(clientId)) { clientIds.add(clientId); - IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", "您有一条工单超时未处理"); + String appMsg="您有一条编号为["+id+"]的工单未处理,请及时处理"; + IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未处理工单推送成功:" + id.toString()); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index c41f9de..b834069 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -70,7 +70,8 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (userClientList.size() > 0) { - IPushResult pushResult = PushList.pushToUser(userClientList, "工单提醒", "您有一条工单超时未接收"); + String appMsg="您有一条编号为["+id+"]的工单未处理,请及时处理"; + IPushResult pushResult = PushList.pushToUser(userClientList, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index ce6b82f..bdae77d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -50,15 +50,12 @@ @RequestMapping(value = "/alarmNow") @ResponseBody public Object alarmNow() { - // 查询当前有效的报警记录(status=1) DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope); - SuccessResponseData successResult = new SuccessResponseData(); successResult.setData(alarmNowViewList); successResult.setMessage("success"); - return successResult; } 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 1535365..aeef333 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 @@ -8,11 +8,9 @@ import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.MessagePusherMapper; -import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.model.UserPush; -import com.casic.missiles.modular.system.service.IBusWellInfoSupportService; import com.casic.missiles.modular.system.service.MessagePusherService; import com.casic.missiles.modular.system.util.PushList; import com.casic.missiles.modular.system.util.WebSocket; @@ -56,7 +54,7 @@ List userClientList = responDeptProvider(deptMap.get("ownerDeptId")); sendJob(id, alarmJob, userClientList);//推送工单至app和pc端 if (StrUtil.isNotBlank(msg)) { - sendAlarm(msg, deptMap.get("deptid"), userClientList);//推送告警至app和pc端 + sendAlarm(msg, deptMap.get("deptid"), userClientList,alarmJob.getDevcode());//推送告警至app和pc端 } } } @@ -79,10 +77,11 @@ } } - private void sendAlarm(String msg, Long deptId, List clientIdlist) { + private void sendAlarm(String msg, Long deptId, List clientIdlist,String devcode) { List userIds = new ArrayList<>(); if (clientIdlist.size() > 0) { - IPushResult pushResult = PushList.pushToUser(clientIdlist, "告警提醒", msg); + String appMsg="设备编号["+devcode+"]发生"+msg; + IPushResult pushResult = PushList.pushToUser(clientIdlist, "告警提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { log.info("告警消息app端推送成功:" + msg); } else { @@ -125,13 +124,11 @@ now.set(Calendar.SECOND, 0); if (!compareNoon()) { now.add(Calendar.DAY_OF_MONTH, +1); - } } } catch (ParseException e) { e.printStackTrace(); } - } Date shouldHandleTime = now.getTime(); if (Boolean.getBoolean(useOverTime)) { @@ -208,6 +205,7 @@ } } ); + return clientLists; }