添加智慧办公回调信息

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java

@@ -101,7 +101,7 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl
             deviceAlarmInfo.setDeviceConnTypeCollect(deviceConnTypeCollect);
 
             //设备厂商分布
-            Map<String, String> deviceFirmCollect = deviceList.parallelStream().collect(groupingBy(x -> FirmMap.get(x) == null ? "未知厂商" : FirmMap.get(x).getFirmName(), Collectors.collectingAndThen(counting(), y ->
+            Map<String, String> deviceFirmCollect = deviceList.parallelStream().collect(groupingBy(x -> FirmMap.get(x.getDeviceFirmId()) == null ? "未知厂商" : FirmMap.get(x.getDeviceFirmId()).getFirmName(), Collectors.collectingAndThen(counting(), y ->
                     NumberUtil.div(y, deviceTotalCount).multiply(new BigDecimal(100)).setScale(2, ROUND_HALF_DOWN).toString()
             )));
             deviceAlarmInfo.setDeviceFirmCollect(deviceFirmCollect);