暂时解决异常

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

@@ -3,6 +3,7 @@ package com.zehong.web.controller.websocket;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zehong.system.domain.TDeviceAlarm;
+import com.zehong.system.domain.vo.DeviceAlarmVo;
 import com.zehong.system.service.ITDeviceAlarmService;
 import com.zehong.system.service.ITDeviceInfoService;
 import com.zehong.system.service.ITPipeService;
@@ -34,7 +35,12 @@ public class WebSocketController {
 
     @GetMapping("/send")
     public void send(int alarmId){
-        TDeviceAlarm alarm = itDeviceAlarmService.selectTDeviceAlarmById(alarmId);
+        DeviceAlarmVo alarm = null;
+        try {
+            alarm = itDeviceAlarmService.selectTDeviceAlarmById(alarmId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         JSONObject json = new JSONObject();
         json.put("alarmInfo",alarm);
         if(PIPE_TYPE.equals(alarm.getAlarmType())){