diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java index 16a463e..203aa23 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java @@ -177,13 +177,15 @@ if (flag) { //推送报警信息 JSONObject headerJson = new JSONObject(); - headerJson.put("msgKey", "alarm"); + headerJson.put("msgKey", "alarm_record"); JSONObject jsonObject = new JSONObject(); jsonObject.put("robotId", robotId); - jsonObject.put("taskType", ObjectUtil.isNotEmpty(taskInfo.getTaskType()) ? dictService.getDictNameByCode("taskType", taskInfo.getTaskType() + "") : ""); - jsonObject.put("discernType", ObjectUtil.isNotEmpty(taskInfo.getDiscernType()) ? dictService.getDictNameByCode("discernType", taskInfo.getDiscernType() + "") : ""); + RobotInfo robotInfo = robotInfoService.getById(robotId); + jsonObject.put("robotName", ObjectUtil.isNotEmpty(robotInfo)?robotInfo.getRobotName():""); + jsonObject.put("taskTypeName", ObjectUtil.isNotEmpty(taskInfo.getTaskType()) ? dictService.getDictNameByCode("taskType", taskInfo.getTaskType() + "") : ""); + jsonObject.put("discernTypeName", ObjectUtil.isNotEmpty(taskInfo.getDiscernType()) ? dictService.getDictNameByCode("discernType", taskInfo.getDiscernType() + "") : ""); jsonObject.put("taskId", taskInfo.getId()); - jsonObject.put("psd", 13); + jsonObject.put("monitorVal", 13); jsonObject.put("x", alarmRecord.getXGrid()); jsonObject.put("y", alarmRecord.getYGrid()); jsonObject.put("alarmTime", new Date());