添加智慧办公回调信息

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceAlarmInfoEntity.java

@@ -70,7 +70,7 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
         if (obj == null) return false;
         if (obj instanceof DeviceAlarmInfoEntity) {
             DeviceAlarmInfoEntity tmp = (DeviceAlarmInfoEntity) obj;
-            if (this.getAlarmDevice() == tmp.getAlarmDevice()) {
+            if (this.getAlarmDevice().equals(tmp.getAlarmDevice())) {
                 return true;
             }
         }

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

@@ -88,12 +88,14 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl
             Map<String, Long> siteDeviceCollect = deviceList.parallelStream().collect(groupingBy(x -> x.getSiteName(), counting()));
             deviceAlarmInfo.setSiteDeviceCollect(siteDeviceCollect);
             //分站点统计设备今日告警数量
-            Map<String, Long> siteDeviceAlarmCollect = deviceAlarmInfoList.parallelStream().distinct().collect(groupingBy(x -> x.getSiteId(), counting()))
+            Map<String, Long> siteDeviceAlarmCollect = deviceAlarmInfoList
+                    .parallelStream().distinct().collect(groupingBy(x -> x.getSiteId(), counting()))
                     .entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
                     .collect(Collectors.toMap(x -> siteMap.get(x.getKey()) == null ? "未知站点" : siteMap.get(x.getKey()).getSiteName(), y -> y.getValue(), (o, n) -> n));
             deviceAlarmInfo.setSiteDeviceAlarmCollect(siteDeviceAlarmCollect);
             //设备类型分布
-            Map<String, String> deviceConnTypeCollect = deviceList.parallelStream().collect(groupingBy(x -> DeviceSrcEnum.getByValue(x.getDeviceSrc()).getDesc(), Collectors.collectingAndThen(counting(), y ->
+            Map<String, String> deviceConnTypeCollect = deviceList.
+                    parallelStream().collect(groupingBy(x -> DeviceSrcEnum.getByValue(x.getDeviceSrc()).getDesc(), Collectors.collectingAndThen(counting(), y ->
                     NumberUtil.div(y, deviceTotalCount).multiply(new BigDecimal(100)).setScale(2, ROUND_HALF_DOWN).toString()
             )));
             deviceAlarmInfo.setDeviceConnTypeCollect(deviceConnTypeCollect);