From 5f414ea91bc67c85700befe28569a1f218a5c17b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 9 Jul 2025 09:09:47 +0800 Subject: [PATCH] device type --- .../impl/KitchenDeviceInfoServiceImpl.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java index 6c039ce..7eae2f1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java @@ -262,14 +262,16 @@ public class KitchenDeviceInfoServiceImpl extends ServiceImpl deviceType() { - Map deviceMap = DeviceTypeEnum.toMap(); - String [] stringArray = new String[]{"摄像头","门禁","留样秤","留样柜","温湿度传感器","烟雾检测传感器","水表","电表","智能出入库秤"}; - // 将 stringArray 转为 Set 便于快速查找 - Set validValues = new HashSet<>(Arrays.asList(stringArray)); - // 使用 Stream 过滤，只保留 value 存在于 validValues 中的条目 - Map filteredMap = deviceMap.entrySet().stream() - .filter(entry -> validValues.contains(entry.getValue())) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return filteredMap; + Map deviceMap = new HashMap<>(); + deviceMap.put(DeviceTypeEnum.CAMERA.getKey(), DeviceTypeEnum.CAMERA.getValue()); + deviceMap.put(DeviceTypeEnum.DOOR.getKey(), DeviceTypeEnum.DOOR.getValue()); + deviceMap.put(DeviceTypeEnum.SAMPLE_WEIGHT.getKey(), DeviceTypeEnum.SAMPLE_WEIGHT.getValue()); + deviceMap.put(DeviceTypeEnum.SAMPLECABINET.getKey(), DeviceTypeEnum.SAMPLECABINET.getValue()); + deviceMap.put(DeviceTypeEnum.TEMPERATURE_HUMIDITY_SENSOR.getKey(), DeviceTypeEnum.TEMPERATURE_HUMIDITY_SENSOR.getValue()); + deviceMap.put(DeviceTypeEnum.SMOKE_SENSOR.getKey(), DeviceTypeEnum.SMOKE_SENSOR.getValue()); + deviceMap.put(DeviceTypeEnum.WATER_METER.getKey(), DeviceTypeEnum.WATER_METER.getValue()); + deviceMap.put(DeviceTypeEnum.ELECTRIC_METER.getKey(), DeviceTypeEnum.ELECTRIC_METER.getValue()); + deviceMap.put(DeviceTypeEnum.SMART_IN_OUT_WEIGHT.getKey(), DeviceTypeEnum.SMART_IN_OUT_WEIGHT.getValue()); + return deviceMap; } }