socket 接口修改 gengdidi

gassafety-admin/src/main/java/com/zehong/web/controller/websocket/WebSocketController.java

@@ -37,14 +37,14 @@ public class WebSocketController {
     public void send(int alarmId){
         try {
             DeviceAlarmVo alarm = itDeviceAlarmService.selectTDeviceAlarmById(alarmId);
-            JSONObject json = new JSONObject();
-            json.put("alarmInfo",alarm);
-            if(PIPE_TYPE.equals(alarm.getAlarmType())){
+            /*JSONObject json = new JSONObject();
+            json.put("alarmInfo",alarm);*/
+            /*if(PIPE_TYPE.equals(alarm.getAlarmType())){
                 json.put("deviceInfo",itPipeService.selectTPipeById(alarm.getDeviceId()));
             }else{
                 json.put("deviceInfo",itDeviceInfoService.selectTDeviceInfoById(alarm.getDeviceId()));
-            }
-            webSocketServer.batchSendMessage(alarm.toString());
+            }*/
+            webSocketServer.batchSendMessage(JSONObject.toJSONString(alarm));
         } catch (Exception e) {
             log.error("wesocket发送失败！");
         }

gassafety-system/src/main/java/com/zehong/system/domain/vo/DeviceAlarmVo.java

@@ -167,4 +167,21 @@ public class DeviceAlarmVo extends BaseEntity
         return dealStatus;
     }
 
+    @Override
+    public String toString() {
+        return "DeviceAlarmVo{" +
+                "alarmId=" + alarmId +
+                ", deviceId=" + deviceId +
+                ", deviceType='" + deviceType + '\'' +
+                ", deviceName='" + deviceName + '\'' +
+                ", deviceCode='" + deviceCode + '\'' +
+                ", iotNo='" + iotNo + '\'' +
+                ", orderId='" + orderId + '\'' +
+                ", alarmType='" + alarmType + '\'' +
+                ", alarmValue='" + alarmValue + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", dealStatus='" + dealStatus + '\'' +
+                '}';
+    }
 }