From dda74d9e651cd57c0544214809eed2eb1ce23bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Mon, 4 Nov 2024 16:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20EquipmentCache=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/das/modules/cache/service/EquipmentCache.java | 4 ++-- .../das/modules/cache/service/impl/EquipmentCacheImpl.java | 4 ++-- .../java/com/das/modules/calc/functions/FunctionRealData.java | 2 +- .../com/das/modules/calc/functions/FunctionSaveCalcData.java | 2 +- .../das/modules/node/service/impl/NodeMessageServiceImpl.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java b/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java index ac6061f6..22dd6b4b 100644 --- a/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java +++ b/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java @@ -25,12 +25,12 @@ public interface EquipmentCache { * @param deviceCode * @return */ - DeviceInfoCache getDeviceInfoCache(String deviceCode); + DeviceInfoCache getDeviceInfoCacheByCode(String deviceCode); /** * 通过设备ID获取设备缓存信息 * @param deviceId * @return */ - DeviceInfoCache getDeviceInfoCache(Long deviceId); + DeviceInfoCache getDeviceInfoCacheById(Long deviceId); } diff --git a/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java index 5f7e9d51..98fdbb67 100644 --- a/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java +++ b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java @@ -94,7 +94,7 @@ public class EquipmentCacheImpl implements EquipmentCache { } @Override - public DeviceInfoCache getDeviceInfoCache(String deviceCode) { + public DeviceInfoCache getDeviceInfoCacheByCode(String deviceCode) { Integer index = deviceCodeIndex.get(deviceCode); if (index != null) { return deviceInfoCaches.get(index); @@ -103,7 +103,7 @@ public class EquipmentCacheImpl implements EquipmentCache { } @Override - public DeviceInfoCache getDeviceInfoCache(Long deviceId) { + public DeviceInfoCache getDeviceInfoCacheById(Long deviceId) { Integer index = deviceIdIndex.get(deviceId); if (index != null) { return deviceInfoCaches.get(index); diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java index 75b69436..8615b8e3 100644 --- a/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java +++ b/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java @@ -37,7 +37,7 @@ public class FunctionRealData extends AbstractFunction { public AviatorObject call(Map env, AviatorObject deviceCode, AviatorObject attributes) { //设备Code String code = (String)deviceCode.getValue(env); - DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(code); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheByCode(code); //属性列表 List list = (List)attributes.getValue(env); List attrs = list.stream().map(String::toLowerCase).toList(); diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java index cd4fcb77..a49a1d33 100644 --- a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java +++ b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java @@ -62,7 +62,7 @@ public class FunctionSaveCalcData extends AbstractVariadicFunction { if ( (args.length - 1) % 3 != 0) { return AviatorRuntimeJavaType.valueOf(1);} //deviceCode String code = (String)args[0].getValue(env); - DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(code); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheByCode(code); List dataList = new ArrayList<>(); for (int i = 1; i < args.length; i+=3) { Date date = (Date)FunctionUtils.getJavaObject(args[i], env); diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java index 7597cad5..98f4f2ec 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java @@ -299,7 +299,7 @@ public class NodeMessageServiceImpl implements NodeMessageService { }); log.info("消息data转化deviceVo,{}",list); for (DeviceEventVo item : list){ - DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(Long.valueOf(item.getDeviceId())); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(Long.valueOf(item.getDeviceId())); DeviceEventInfo deviceEventInfo = new DeviceEventInfo(); deviceEventInfo.setUpdateTime(item.getEventTime()); deviceEventInfo.setEventId(IdWorker.getId());