通道、硬盘、子系统及防区入库修改

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/dto/alarmHost/AlarmInputInfo.java

@@ -28,4 +28,6 @@ public class AlarmInputInfo  implements Serializable {
     private String moduleType;
 
     private String sensorType;
+
+    private String sensorName;
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/service/impl/WebsocketServiceImpl.java

@@ -830,6 +830,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
         info.setDefenceAreaName(alarmInputInfo.getInputName());
         info.setDefenceAreaIndex(alarmInputInfo.getInputIndex());
         info.setSensorType(alarmInputInfo.getSensorType());
+        info.setSensorTypeName(alarmInputInfo.getSensorName());
         //info.setSensorTypeName();
         //alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
         info.setState("unKnown");
@@ -850,6 +851,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
         info.setOrgName(serverInfo.getOrgName());
         info.setOrgPath(serverInfo.getOrgPath());
         info.setSensorType(alarmInputInfo.getSensorType());
+        info.setSensorTypeName(alarmInputInfo.getSensorName());
         info.setUpdateBy("system");
         info.setUpdateTime(LocalDateTime.now());
     }
@@ -896,9 +898,13 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
                     dealBaseDeviceInfo(list, req.getToken());
                 }
             } else if (WebSocketConstants.GET_ALARM_HOST_DEVICE_INFOS.equals(req.getEvent())) {
-                dealAlarmHostBaseInfo((AlarmHostBaseInfo) req.getData(), req.getToken());
+                JSONObject object = (JSONObject) req.getData();
+                final AlarmHostBaseInfo alarmHostBaseInfo = JSON.toJavaObject(object, AlarmHostBaseInfo.class);
+                dealAlarmHostBaseInfo(alarmHostBaseInfo, req.getToken());
             } else if (WebSocketConstants.GET_DVS_DEVICE_INFOS.equals(req.getEvent())) {
-                dealDvsBaseInfo((DvsBaseInfo) req.getData(), req.getToken());
+                JSONObject object = (JSONObject) req.getData();
+                final DvsBaseInfo dvsBaseInfo = JSON.toJavaObject(object, DvsBaseInfo.class);
+                dealDvsBaseInfo(dvsBaseInfo, req.getToken());
             }
         } catch (Exception e) {
             e.printStackTrace();