diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java index f0d93d5..3ea86d0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java @@ -138,7 +138,10 @@ alarm.setAlarmTime(TimeUtil.getCurrentTime()); //WebSocket发送报警信息给前端 - webSocket.sendAllMessage(JSON.toJSONString(alarm)); + WebSocketDTO dto = new WebSocketDTO(); + dto.setType("alarm"); + dto.setMessageObject(alarm); + webSocket.sendAllMessage(JSON.toJSONString(dto)); return alarm; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java index f0d93d5..3ea86d0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java @@ -138,7 +138,10 @@ alarm.setAlarmTime(TimeUtil.getCurrentTime()); //WebSocket发送报警信息给前端 - webSocket.sendAllMessage(JSON.toJSONString(alarm)); + WebSocketDTO dto = new WebSocketDTO(); + dto.setType("alarm"); + dto.setMessageObject(alarm); + webSocket.sendAllMessage(JSON.toJSONString(dto)); return alarm; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/WebSocketDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/WebSocketDTO.java new file mode 100644 index 0000000..ef4b42b --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/WebSocketDTO.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author a203 + */ +@Data +@NoArgsConstructor +public class WebSocketDTO { + private String type; + + private Object messageObject; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java index f0d93d5..3ea86d0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java @@ -138,7 +138,10 @@ alarm.setAlarmTime(TimeUtil.getCurrentTime()); //WebSocket发送报警信息给前端 - webSocket.sendAllMessage(JSON.toJSONString(alarm)); + WebSocketDTO dto = new WebSocketDTO(); + dto.setType("alarm"); + dto.setMessageObject(alarm); + webSocket.sendAllMessage(JSON.toJSONString(dto)); return alarm; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/WebSocketDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/WebSocketDTO.java new file mode 100644 index 0000000..ef4b42b --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/WebSocketDTO.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author a203 + */ +@Data +@NoArgsConstructor +public class WebSocketDTO { + private String type; + + private Object messageObject; +} diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index 117a012..d773f24 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -2,10 +2,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.modular.system.dto.OceanDetailDTO; -import com.casic.missiles.modular.system.dto.ShipDTO; -import com.casic.missiles.modular.system.dto.TyphoonDTO; -import com.casic.missiles.modular.system.dto.TyphoonDetailDTO; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.*; import com.casic.missiles.modular.system.utils.*; @@ -484,7 +481,10 @@ saveDataLog(0, String.valueOf(robotId), shelterPosition, "0"); shelterPositionService.save(shelterPosition); //方舱经纬度推送到前端 - webSocket.sendAllMessage(JSON.toJSONString(shelterPosition)); + WebSocketDTO dto = new WebSocketDTO(); + dto.setType("shelterPosition"); + dto.setMessageObject(shelterPosition); + webSocket.sendAllMessage(JSON.toJSONString(dto)); break; default: break;