Merge branch 'hcp' into test

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -532,10 +532,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         //锁机、未锁机
         Map<Integer, Long> countLockLstateMap = deviceStatuses.stream().collect(Collectors
                 .groupingBy(DeviceStatus::getLockStateL, Collectors.counting()));
-        int lockLStateNum = countLockLstateMap.get(DeviceLockState.LOCK.getCode()).intValue();
-        int unLockLStateNum = countLockLstateMap.get(DeviceLockState.UN_LOCK.getCode()).intValue();
-        mercHomeStatisticalVO.setOperatingNum(unLockLStateNum);
-        mercHomeStatisticalVO.setClosedNum(lockLStateNum);
+        Long lockLStateNum = countLockLstateMap.get(DeviceLockState.LOCK.getCode());
+        Long unLockLStateNum = countLockLstateMap.get(DeviceLockState.UN_LOCK.getCode());
+        mercHomeStatisticalVO.setOperatingNum(unLockLStateNum == null ? 0 : unLockLStateNum.intValue());
+        mercHomeStatisticalVO.setClosedNum(lockLStateNum == null ? 0 : lockLStateNum.intValue());
         //待补货
         Integer deviceNum = R.feignCheckData(goodsDeviceService.countOutOfStockDevice(new GoodsDeviceDto.CountOutOfStockDevice().setMercId(mercId)));
         mercHomeStatisticalVO.setNeedToFillNum(deviceNum);