Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

zhangcl 2 dní pred
rodič
commit
5494eff95a

+ 1 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -448,7 +448,7 @@ public class IotStaticController {
             List<DeviceVO> deviceVOS = tdDeviceMapper.selectAllBtTimeAndIdentifier(deviceName.toLowerCase(), identifier, start1, end1);
             deviceVOS.forEach(deviceVO->{
                 deviceVO.setTimestamp(deviceVO.getTs().getTime());
-                deviceVO.setValue(Double.valueOf(deviceVO.getLogValue()));
+                deviceVO.setValue(Objects.nonNull(deviceVO.getLogValue())?Double.valueOf(deviceVO.getLogValue()):null);
             });
             return CommonResult.success(deviceVOS.stream().sorted(Comparator.comparing(DeviceVO::getTimestamp).reversed()).collect(Collectors.toList()));
         } else {