sion/sionrui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot

Browse Source 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
This commit is contained in:
YunaiV
2025-06-15 19:13:07 +08:00
parent 1328d91987 03d3ebdf05
commit 4e3cfd83bd
202 changed files with 10089 additions and 2391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
@Transactional(rollbackFor = Exception.class)
public void updateDeviceGroup(IotDeviceUpdateGroupReqVO updateReqVO) {
// 1.1 校验设备存在
List<IotDeviceDO> devices = deviceMapper.selectBatchIds(updateReqVO.getIds());
List<IotDeviceDO> devices = deviceMapper.selectByIds(updateReqVO.getIds());
if (CollUtil.isEmpty(devices)) {
return;
}
@@ -188,7 +188,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
if (CollUtil.isEmpty(ids)) {
return;
}
List<IotDeviceDO> devices = deviceMapper.selectBatchIds(ids);
List<IotDeviceDO> devices = deviceMapper.selectByIds(ids);
if (CollUtil.isEmpty(devices)) {
return;
}

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java
View File

@@ -78,7 +78,7 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService
if (CollUtil.isEmpty(ids)) {
return CollUtil.newArrayList();
}
return iotProductCategoryMapper.selectBatchIds(ids);
return iotProductCategoryMapper.selectByIds(ids);
}
@Override
@@ -120,4 +120,4 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService
return categoryDeviceCountMap;
}
}
}