From ce494541d1a967453c33b9cab57af18476271ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Fri, 1 Nov 2024 16:13:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=A6=BBCacheService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{calc/domain/vo => cache/domain}/DeviceInfoCache.java | 3 ++- .../das/modules/{calc => cache}/service/CacheService.java | 8 ++++---- .../com/das/modules/calc/functions/FunctionRealData.java | 5 ++--- .../das/modules/calc/functions/FunctionSaveCalcData.java | 6 ++---- .../main/java/com/das/modules/calc/service/CalcJob.java | 1 + .../java/com/das/modules/calc/service/CalcService.java | 1 + 6 files changed, 12 insertions(+), 12 deletions(-) rename das/src/main/java/com/das/modules/{calc/domain/vo => cache/domain}/DeviceInfoCache.java (75%) rename das/src/main/java/com/das/modules/{calc => cache}/service/CacheService.java (94%) diff --git a/das/src/main/java/com/das/modules/calc/domain/vo/DeviceInfoCache.java b/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java similarity index 75% rename from das/src/main/java/com/das/modules/calc/domain/vo/DeviceInfoCache.java rename to das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java index fba18494..172a819c 100644 --- a/das/src/main/java/com/das/modules/calc/domain/vo/DeviceInfoCache.java +++ b/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java @@ -1,4 +1,4 @@ -package com.das.modules.calc.domain.vo; +package com.das.modules.cache.domain; import lombok.Data; @@ -9,6 +9,7 @@ import lombok.Data; public class DeviceInfoCache { private Long deviceId; private String deviceCode; + private String deviceName; private Integer objectType; private Long parentDeviceId; } diff --git a/das/src/main/java/com/das/modules/calc/service/CacheService.java b/das/src/main/java/com/das/modules/cache/service/CacheService.java similarity index 94% rename from das/src/main/java/com/das/modules/calc/service/CacheService.java rename to das/src/main/java/com/das/modules/cache/service/CacheService.java index 3f74999f..886f4c87 100644 --- a/das/src/main/java/com/das/modules/calc/service/CacheService.java +++ b/das/src/main/java/com/das/modules/cache/service/CacheService.java @@ -1,6 +1,6 @@ -package com.das.modules.calc.service; +package com.das.modules.cache.service; -import com.das.modules.calc.domain.vo.DeviceInfoCache; +import com.das.modules.cache.domain.DeviceInfoCache; import com.das.modules.equipment.entity.SysEquipment; import com.das.modules.equipment.mapper.SysEquipmentMapper; import jakarta.annotation.PostConstruct; @@ -61,6 +61,7 @@ public class CacheService { DeviceInfoCache deviceInfoCache = new DeviceInfoCache(); deviceInfoCache.setDeviceId(equipment.getId()); deviceInfoCache.setDeviceCode(equipment.getCode()); + deviceInfoCache.setDeviceName(equipment.getName()); deviceInfoCache.setObjectType(equipment.getObjectType()); deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); deviceInfoCaches.add(deviceInfoCache); @@ -68,8 +69,7 @@ public class CacheService { deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),i); //创建Id索引 deviceIdIndex.put(equipment.getId(),i); - //关联风场缓存 -// if (equipment.getObjectType().equals() + } } 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 6fb013c5..4fa75677 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 @@ -1,12 +1,11 @@ package com.das.modules.calc.functions; -import com.das.modules.calc.domain.vo.DeviceInfoCache; -import com.das.modules.calc.service.CacheService; +import com.das.modules.cache.domain.DeviceInfoCache; +import com.das.modules.cache.service.CacheService; import com.das.modules.data.domain.SnapshotValueQueryParam; import com.das.modules.data.service.DataService; import com.googlecode.aviator.runtime.function.AbstractFunction; import com.googlecode.aviator.runtime.type.*; -import com.googlecode.aviator.utils.Env; import lombok.extern.slf4j.Slf4j; import java.util.HashMap; 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 9e9ad09a..71ce79e0 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 @@ -1,11 +1,9 @@ package com.das.modules.calc.functions; -import com.das.modules.calc.domain.vo.DeviceInfoCache; -import com.das.modules.calc.service.CacheService; -import com.das.modules.data.domain.SnapshotValueQueryParam; +import com.das.modules.cache.domain.DeviceInfoCache; +import com.das.modules.cache.service.CacheService; import com.das.modules.data.service.DataService; import com.das.modules.node.domain.bo.CalculateRTData; -import com.googlecode.aviator.runtime.function.AbstractFunction; import com.googlecode.aviator.runtime.function.AbstractVariadicFunction; import com.googlecode.aviator.runtime.function.FunctionUtils; import com.googlecode.aviator.runtime.type.AviatorObject; diff --git a/das/src/main/java/com/das/modules/calc/service/CalcJob.java b/das/src/main/java/com/das/modules/calc/service/CalcJob.java index 104cde7e..98426749 100644 --- a/das/src/main/java/com/das/modules/calc/service/CalcJob.java +++ b/das/src/main/java/com/das/modules/calc/service/CalcJob.java @@ -1,5 +1,6 @@ package com.das.modules.calc.service; +import com.das.modules.cache.service.CacheService; import com.das.modules.calc.domain.entity.CalcModule; import com.googlecode.aviator.AviatorEvaluatorInstance; import com.googlecode.aviator.Expression; diff --git a/das/src/main/java/com/das/modules/calc/service/CalcService.java b/das/src/main/java/com/das/modules/calc/service/CalcService.java index 6b8bba3e..bc72a2af 100644 --- a/das/src/main/java/com/das/modules/calc/service/CalcService.java +++ b/das/src/main/java/com/das/modules/calc/service/CalcService.java @@ -1,6 +1,7 @@ package com.das.modules.calc.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.das.modules.cache.service.CacheService; import com.das.modules.calc.domain.entity.CalcModule; import com.das.modules.calc.functions.FunctionRealData; import com.das.modules.calc.functions.FunctionSaveCalcData;