host 设备基础数据联调代码提交

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/iot/service/impl/IotDeviceInfoServiceImpl.java

@@ -272,7 +272,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
 
     @Override
     public ProductEnums product() {
-        return ProductEnums.IOT_SERVER;
+        return ProductEnums.DETECTION_HOST;
     }
 
     @Override
@@ -676,8 +676,8 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         info.setSubSystemCode(String.valueOf(subSystemInfo.getDeviceCode()));
         info.setDefenceAreaName(defenceAreaInfo.getDeviceName());
         info.setDefenceAreaIndex(Integer.parseInt(defenceAreaInfo.getDeviceCode()));
-        info.setSensorType(subSystemInfo.getSubType());
-        info.setSensorTypeName(DefenceAreaType.getName(subSystemInfo.getSubType()));
+        info.setSensorType(defenceAreaInfo.getSubType());
+        info.setSensorTypeName(DefenceAreaType.getName(defenceAreaInfo.getSubType()));
         //info.setSensorTypeName();
         //alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
         info.setState("unKnown");

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/enums/ProductEnums.java

@@ -15,6 +15,7 @@ public enum ProductEnums {
     ALARM_HOST(new String[]{"InAnter_BM1600NTSmall", "Hik_DS19A", "HikModule", "FengYe_H402", "HengTong_CKWU01C", "MtaOCX", "CrossProcessDemo", "HoneywellOCX_IPM", "DaHuaAlarmHost", "BOSCH_CMS"}),
 
     IOT_SERVER(new String[]{"IoTServer","IoTServerDevice"}),
+    DETECTION_HOST(new String[]{"DetectionHost","DetectionHostDevice"}),
     FSU_GATEWAY(new String[]{"FSU_Gateway","FSU_Smoke","FSU_Infrared","FSU_TemperatureAndHumidity","FSU_DoorMagnetic","FSU_Gas","FSU_RollingShutterDoor","FSU_Water","FSU_SmartMeter","FSU_AirConditioner","FSU_Ups","FSU_DoPowerControl","FSU_ThreePhaseACVoltage"}),
     ;