B端设备列表 温控仪反显

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

@@ -1208,12 +1208,16 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         //没有管理员的的设置默认值
         deviceInfoList.stream().filter(s -> s.getAdminName() == null).forEach(s -> s.setAdminName("未分配管理员"));
         List<String> adminNameList = deviceInfoList.stream().map(DeviceInfoDto.Vo::getAdminName).distinct().collect(Collectors.toList());
-
+        List<Long> dIds = deviceInfoList.stream().map(DeviceInfoDto.Vo::getDeviceId).distinct().collect(Collectors.toList());
+        List<DeviceSysinfoDto.Vo> deviceSysList = R.feignCheckData(deviceSysinfoService.list(new DeviceSysinfoDto.SelectList().setDeviceIds(dIds)));
+        Map<Long, DeviceSysinfoDto.Vo> deviceSysInfoMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(deviceSysList)) {
+            deviceSysInfoMap = deviceSysList.stream().collect(Collectors.toMap(DeviceSysinfoDto.Vo::getDeviceId, i -> i));
+        }
 
         //根据管理员名字分组
         Map<String, List<DeviceInfoDto.Vo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfoDto.Vo::getAdminName));
 
-
         DateTime date = DateTime.now();
         DateTime start = DateUtil.beginOfDay(date);
         DateTime end = DateUtil.endOfDay(date);
@@ -1271,7 +1275,13 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                         device.setFillNum(goodsDevice.stream().mapToInt(GoodsDeviceDto.Vo::getFillCount).sum());
                     }
                 }
-
+                //温控仪 反显
+                DeviceSysinfoDto.Vo dSysInfo = deviceSysInfoMap.get(dId);
+                if (dSysInfo == null) {
+                    device.setIsHaveTemp(false);
+                } else {
+                    device.setIsHaveTemp(BooleanUtil.isTrue(dSysInfo.getIsHaveTemp()));
+                }
 
                 //算法類型
                 Long algorithmId = device.getAlgorithmId();

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -1056,6 +1056,12 @@ public class DeviceInfoDto {
     @Accessors(chain = true)
     public static class MercHomeDeviceVo {
 
+        /**
+         * 是否有温控仪
+         */
+        @ApiModelProperty("是否有温控仪")
+        private Boolean isHaveTemp;
+
         @ApiModelProperty("温度值")
         private Integer tempValue;