Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -542,6 +542,9 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
         if (!Objects.equals(platDeviceBaseAttrDTO.getRadarMount(), dto.getRadarMount())) {
         if (!Objects.equals(platDeviceBaseAttrDTO.getRadarMount(), dto.getRadarMount())) {
             map.put("radarMount", dto.getRadarMount());
             map.put("radarMount", dto.getRadarMount());
         }
         }
+        if (!Objects.equals(platDeviceBaseAttrDTO.getRadarHight(), dto.getRadarHight())) {
+            map.put("radarHight", dto.getRadarHight());
+        }
         if (!Objects.equals(platDeviceBaseAttrDTO.getRadarDelay(), dto.getRadarDelay())) {
         if (!Objects.equals(platDeviceBaseAttrDTO.getRadarDelay(), dto.getRadarDelay())) {
             map.put("radarDelay", dto.getRadarDelay() );
             map.put("radarDelay", dto.getRadarDelay() );
         }
         }
@@ -561,10 +564,10 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
         log.info("写入设备属性请求参数:{}",JSON.toJSONString(dto));
         log.info("写入设备属性请求参数:{}",JSON.toJSONString(dto));
         Map<String, Object> map = Maps.newHashMap();
         Map<String, Object> map = Maps.newHashMap();
         map.put("usrServerInfo",JSON.toJSONString(usrServerInfo));
         map.put("usrServerInfo",JSON.toJSONString(usrServerInfo));
-        String result = devicePropertiesOperateService.deviceWriteAttr(deviceId, map);
+  /*      String result = devicePropertiesOperateService.deviceWriteAttr(deviceId, map);
         if (StringUtils.isNotEmpty(result)) {
         if (StringUtils.isNotEmpty(result)) {
             throw new RuntimeException("设备写入失败：" + result);
             throw new RuntimeException("设备写入失败：" + result);
-        }
+        }*/
         List<PlatDeviceOther> platDeviceOtherList = platDeviceOtherService.list(new QueryWrapper<PlatDeviceOther>().lambda()
         List<PlatDeviceOther> platDeviceOtherList = platDeviceOtherService.list(new QueryWrapper<PlatDeviceOther>().lambda()
                 .eq(PlatDeviceOther::getOriDeviceId, deviceId));
                 .eq(PlatDeviceOther::getOriDeviceId, deviceId));
         for (PlatDeviceOther platDeviceOther : platDeviceOtherList) {
         for (PlatDeviceOther platDeviceOther : platDeviceOtherList) {

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -218,7 +218,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         fill(list);
         fill(list);
 
 
-        List<PlatElderListVO> roomIds = list.stream().filter(platElderListVO -> StringUtils.isNotEmpty(platElderListVO.getRoomId())).collect(Collectors.toList());
+        List<String> roomIds = list.stream().filter(platElderListVO -> StringUtils.isNotEmpty(platElderListVO.getRoomId()))
+                .map(PlatElderListVO::getRoomId).collect(Collectors.toList());
         List<PlatRoomBedDevice> platRoomDevices = platRoomBedDeviceService.list(new QueryWrapper<PlatRoomBedDevice>().lambda()
         List<PlatRoomBedDevice> platRoomDevices = platRoomBedDeviceService.list(new QueryWrapper<PlatRoomBedDevice>().lambda()
                 .in(PlatRoomBedDevice::getRoomId, roomIds)
                 .in(PlatRoomBedDevice::getRoomId, roomIds)
                 .isNull(PlatRoomBedDevice::getBedId));
                 .isNull(PlatRoomBedDevice::getBedId));