Merge remote-tracking branch 'origin/master'

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

@@ -564,12 +564,11 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = Beans.copy(DeviceInfoDto.MercHomeDeviceVo.class, deviceMap.get(placeLineId));
 
             //设备销售统计
-            String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
             String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
             List<Long> deviceIds = deviceInfos.stream().map(DeviceInfoDto.MercHomeDeviceVo::getDeviceId).collect(Collectors.toList());
             //统计条件：当天
             DeviceDataDto.ListDTO deviceDataListDTO = new DeviceDataDto.ListDTO()
-                    .setDeviceIds(deviceIds).setType(type).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
+                    .setDeviceIds(deviceIds).setType(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey()).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
             List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(deviceDataListDTO);
             Map<Long, DeviceDataDto.Vo> dataMap = new HashMap<>();
             if (CollUtil.isNotEmpty(deviceDataList)) {
@@ -584,9 +583,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 datdeviceStatusMap = deviceStatusList.stream().collect(Collectors.toMap(DeviceStatusDto.Vo::getDeviceId, d -> d));
             }
 
-            Map<Long, DeviceDataDto.Vo> finalDataMap = dataMap;
-            Map<Long, DeviceStatusDto.Vo> finalDatdeviceStatusMap = datdeviceStatusMap;
-            deviceInfos.forEach(device -> {
+            for (DeviceInfoDto.MercHomeDeviceVo device : deviceInfos) {
                 Long dId = device.getDeviceId();
                 //设备类型 反显
                 SysDictRedis dictDeviceType = SysDictUtils.get(DictConsts.DEVICE_TYPE, String.valueOf(device.getDeviceType()));
@@ -594,13 +591,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 //运营状态 反显
                 SysDictRedis dictBusyState = SysDictUtils.get(DictConsts.DEVICE_BUSY_STATUS, String.valueOf(device.getBusyState()));
                 device.setBusyStateName(dictBusyState.getMsg());
-                DeviceDataDto.Vo deviceData = finalDataMap.get(dId);
-
+                DeviceDataDto.Vo deviceData = dataMap.get(dId);
 
                 //今日销售、库存情况 反显
                 device.setDayOrderNum(deviceData != null ? deviceData.getSalesCount() : 0);
                 device.setDaySalesPrice(deviceData != null ? deviceData.getSalesMoney() : 0);
-                DeviceStatusDto.Vo deviceStatus = finalDatdeviceStatusMap.get(device.getDeviceId());
+                DeviceStatusDto.Vo deviceStatus = datdeviceStatusMap.get(device.getDeviceId());
                 Integer stock = Emptys.check(deviceStatus.getStock()) ? deviceStatus.getStock() : 0;
                 device.setOnSaleNum(stock);
                 Integer afterFillStock = Emptys.check(deviceStatus.getAfterFillStock()) ? deviceStatus.getAfterFillStock() : 0;
@@ -614,7 +610,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     device.setNetStateName(DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
                 }
 
-            });
+            }
             vo.setDeviceInfos(deviceInfos);
             dataList.add(vo);
         });