获取报警主机下防区接口修改

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

@@ -17,9 +17,9 @@ public class AlarmInputInfo  implements Serializable {
 
     private String deviceName;
 
-    private String inputName;
+    private String displayName;
 
-    private Integer inputIndex;
+    private Integer index;
 
     private Integer moduleAddress;
 

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

@@ -17,9 +17,9 @@ public class AlarmOutputInfo implements Serializable {
 
     private String deviceName;
 
-    private String outputName;
+    private String displayName;
 
-    private Integer outputIndex;
+    private Integer index;
 
     private Integer moduleAddress;
 

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

@@ -17,7 +17,7 @@ public class SubSystemInfo  implements Serializable {
 
     private String deviceName;
 
-    private String subsystemName;
+    private String displayName;
 
-    private Integer subsystemId;
+    private Integer id;
 }

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

@@ -810,7 +810,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
             log.error("同步报警主机子系统信息，获取报警主机子系统信息为空");
         } else {
             for (SubSystemInfo subSystemInfo : subSystemInfos) {
-                IotAlarmSubsystem info = iotAlarmSubsystemService.getByDeviceNameAndSubSystemId(token, subSystemInfo.getDeviceName(), subSystemInfo.getSubsystemId());
+                IotAlarmSubsystem info = iotAlarmSubsystemService.getByDeviceNameAndSubSystemId(token, subSystemInfo.getDeviceName(), subSystemInfo.getId());
                 if (info == null) {
                     info = createAlarmSubSystem(subSystemInfo, serverInfo);
                     addList.add(info);
@@ -826,8 +826,8 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
         IotAlarmSubsystem info = new IotAlarmSubsystem();
         long id = IdWorker.getId(info);
         info.setDeleted(0);
-        info.setCode(String.valueOf(subSystemInfo.getSubsystemId()));
-        info.setName(subSystemInfo.getSubsystemName());
+        info.setCode(String.valueOf(subSystemInfo.getId()));
+        info.setName(subSystemInfo.getDisplayName());
         //布防状态，0：撤防，1：布防,2:未知（未登记过或离线）
         info.setStatus(2);
         info.setOrgId(serverInfo.getOrgId());
@@ -848,7 +848,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
 
     private void dealAlarmSubSystem(SubSystemInfo subSystemInfo, IotAlarmSubsystem info, IotServerInfo serverInfo) {
         info.setDeleted(0);
-        info.setName(subSystemInfo.getSubsystemName());
+        info.setName(subSystemInfo.getDisplayName());
         info.setOrgId(serverInfo.getOrgId());
         info.setOrgName(serverInfo.getOrgName());
         info.setOrgPath(serverInfo.getOrgPath());
@@ -870,7 +870,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
             log.error("同步报警主机防区信息，获取报警主机防区信息为空");
         } else {
             for (AlarmInputInfo alarmInputInfo : alarmInputInfos) {
-                IotAlarmDefenceArea info = iotAlarmDefenceAreaService.getBySubSystemCodeAndDeviceName(token, alarmInputInfo.getDeviceName(), alarmInputInfo.getSubsystemId(), alarmInputInfo.getInputIndex());
+                IotAlarmDefenceArea info = iotAlarmDefenceAreaService.getBySubSystemCodeAndDeviceName(token, alarmInputInfo.getDeviceName(), alarmInputInfo.getSubsystemId(), alarmInputInfo.getIndex());
                 if (info == null) {
                     info = createDefenceArea(alarmInputInfo, serverInfo);
                     addList.add(info);
@@ -888,8 +888,8 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
         info.setDeleted(0);
         info.setAlarmHostCode(alarmInputInfo.getDeviceName());
         info.setSubSystemCode(String.valueOf(alarmInputInfo.getSubsystemId()));
-        info.setDefenceAreaName(alarmInputInfo.getInputName());
-        info.setDefenceAreaIndex(alarmInputInfo.getInputIndex());
+        info.setDefenceAreaName(alarmInputInfo.getDisplayName());
+        info.setDefenceAreaIndex(alarmInputInfo.getIndex());
         info.setSensorType(alarmInputInfo.getSensorType());
         info.setSensorTypeName(alarmInputInfo.getSensorName());
         //info.setSensorTypeName();
@@ -908,7 +908,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
 
     private void dealDefenceArea(AlarmInputInfo alarmInputInfo, IotAlarmDefenceArea info, IotServerInfo serverInfo) {
         info.setDeleted(0);
-        info.setDefenceAreaName(alarmInputInfo.getInputName());
+        info.setDefenceAreaName(alarmInputInfo.getDisplayName());
         info.setOrgId(serverInfo.getOrgId());
         info.setOrgName(serverInfo.getOrgName());
         info.setOrgPath(serverInfo.getOrgPath());