java/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2025-10-28 12:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix：【iot 物联网】增强 jdk8 的兼容性

Browse Source
This commit is contained in:
YunaiV
2025-10-02 18:51:19 +08:00
parent 1a2639e432
commit b167b419f4
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
View File

@ -50,7 +50,7 @@ public class YudaoWebAutoConfiguration {
@Override @Override
public RequestMappingHandlerMapping getRequestMappingHandlerMapping() { public RequestMappingHandlerMapping getRequestMappingHandlerMapping() {
var mapping = new RequestMappingHandlerMapping(); RequestMappingHandlerMapping mapping = new RequestMappingHandlerMapping();
// 实例化时就带上前缀 // 实例化时就带上前缀
mapping.setPathPrefixes(buildPathPrefixes(webProperties)); mapping.setPathPrefixes(buildPathPrefixes(webProperties));
return mapping; return mapping;

10
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
View File

@ -240,24 +240,20 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService {
* @return 规则场景列表 * @return 规则场景列表
*/ */
private List<IotSceneRuleDO> getMatchedSceneRuleListByMessage(IotDeviceMessage message) { private List<IotSceneRuleDO> getMatchedSceneRuleListByMessage(IotDeviceMessage message) {
// 1. 匹配设备
// TODO 缓存 @puhui999：可能需要 getSelf()
// 1.1 通过 deviceId 获取设备信息 // 1.1 通过 deviceId 获取设备信息
IotDeviceDO device = getSelf().deviceService.getDeviceFromCache(message.getDeviceId()); IotDeviceDO device = getSelf().deviceService.getDeviceFromCache(message.getDeviceId());
if (device == null) { if (device == null) {
log.warn("[getMatchedSceneRuleListByMessage][设备({}) 不存在]", message.getDeviceId()); log.warn("[getMatchedSceneRuleListByMessage][设备({}) 不存在]", message.getDeviceId());
return List.of(); return ListUtil.of();
} }
// 1.2 通过 productId 获取产品信息 // 1.2 通过 productId 获取产品信息
IotProductDO product = getSelf().productService.getProductFromCache(device.getProductId()); IotProductDO product = getSelf().productService.getProductFromCache(device.getProductId());
if (product == null) { if (product == null) {
log.warn("[getMatchedSceneRuleListByMessage][产品({}) 不存在]", device.getProductId()); log.warn("[getMatchedSceneRuleListByMessage][产品({}) 不存在]", device.getProductId());
return List.of(); return ListUtil.of();
} }
// 1.3 获取匹配的规则场景 // 1.3 获取匹配的规则场景
List<IotSceneRuleDO> sceneRules = getSceneRuleListByProductIdAndDeviceIdFromCache( List<IotSceneRuleDO> sceneRules = getSelf().getSceneRuleListByProductIdAndDeviceIdFromCache(
product.getId(), device.getId()); product.getId(), device.getId());
if (CollUtil.isEmpty(sceneRules)) { if (CollUtil.isEmpty(sceneRules)) {
return sceneRules; return sceneRules;