From cde131b48fb4a6a9a49eb968af5d403e7b76c112 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 10:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cache/service/CacheService.java | 144 +----------------- .../modules/cache/service/EquipmentCache.java | 19 +++ .../cache/service/impl/CacheServiceImpl.java | 18 +++ .../service/impl/EquipmentCacheImpl.java | 107 +++++++++++++ .../calc/functions/FunctionRealData.java | 2 +- .../calc/functions/FunctionSaveCalcData.java | 2 +- .../com/das/modules/calc/service/CalcJob.java | 3 +- .../service/impl/NodeMessageServiceImpl.java | 11 +- 8 files changed, 154 insertions(+), 152 deletions(-) create mode 100644 das/src/main/java/com/das/modules/cache/service/EquipmentCache.java create mode 100644 das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java create mode 100644 das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java diff --git a/das/src/main/java/com/das/modules/cache/service/CacheService.java b/das/src/main/java/com/das/modules/cache/service/CacheService.java index efffc4b6..0e3763a0 100644 --- a/das/src/main/java/com/das/modules/cache/service/CacheService.java +++ b/das/src/main/java/com/das/modules/cache/service/CacheService.java @@ -1,147 +1,13 @@ package com.das.modules.cache.service; -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; -import jakarta.annotation.PreDestroy; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - /** - * 计算缓存服务 - * 用于缓存常用数据，供计算服务使用 + * 应用缓存接口 + * */ -@Service -public class CacheService { - - @Autowired - SysEquipmentMapper sysEquipmentMapper; - +public interface CacheService { /** - * 缓存初始化 - */ - @PostConstruct - public void init() { - initDeviceInfoCaches(); - } - - /** - * 缓存释放 - */ - @PreDestroy - public void destroy() { - freeDeviceInfoCaches(); - } - - ///-设备缓存---------------------------------------------------------------- - /** - * 设备缓存信息 - */ - private final List deviceInfoCaches = Collections.synchronizedList(new ArrayList<>()); - - /** - * 设备CODE索引，用于通过设备CODE访问设备缓存信息 - */ - private final ConcurrentHashMap deviceCodeIndex = new ConcurrentHashMap<>(); - private final ConcurrentHashMap deviceIdIndex = new ConcurrentHashMap<>(); - - private DeviceInfoCache windFarmCache = null; - /** - * 初始化设备缓存信息 - */ - private void initDeviceInfoCaches() { - List equipments = sysEquipmentMapper.selectList(); - for (int i = 0; i < equipments.size(); i++) { - SysEquipment equipment = equipments.get(i); - 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); - //创建Code索引 - deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),i); - //创建Id索引 - deviceIdIndex.put(equipment.getId(),i); - - } - } - - /** - * 释放设备缓存信息 - */ - private void freeDeviceInfoCaches() { - deviceInfoCaches.clear(); - deviceCodeIndex.clear(); - } - - /** - * 返回设备缓存信息列表 + * 获取设备缓存接口 * @return */ - public List getDevicesCache() { - return deviceInfoCaches; - } - - /** - * 根据设备CODE返回设备缓存信息 - * @param deviceCode - * @return - */ - public DeviceInfoCache getDeviceInfoCache(String deviceCode) { - Integer index = deviceCodeIndex.get(deviceCode); - if (index != null) { - return deviceInfoCaches.get(index); - } - return null; - } - - /** - * 根据设备IRN返回设备缓存信息 - * @param deviceId - * @return - */ - public DeviceInfoCache getDeviceInfoCache(Long deviceId) { - Integer index = deviceIdIndex.get(deviceId); - if (index != null) { - return deviceInfoCaches.get(index); - } - return null; - } - - /** - * 刷新指定设备ID的设备缓存，如果缓存不存在则添加。 - * @param deviceId - */ - public void refreshDeviceCache(Long deviceId) { - SysEquipment equipment = sysEquipmentMapper.selectById(deviceId); - if (equipment != null) { - DeviceInfoCache deviceInfoCache = new DeviceInfoCache(); - deviceInfoCache.setDeviceId(equipment.getId()); - deviceInfoCache.setDeviceCode(equipment.getCode()); - deviceInfoCache.setDeviceName(equipment.getName()); - deviceInfoCache.setObjectType(equipment.getObjectType()); - deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); - //如果是已经缓存过的设备直接缓存 - Integer index = deviceIdIndex.get(deviceId); - if (index != null) { - deviceInfoCaches.set(index, deviceInfoCache); - } - else{ - deviceInfoCaches.add(deviceInfoCache); - index = deviceInfoCaches.size(); - deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),index); - deviceIdIndex.put(equipment.getId(),index); - } - } - } - - ///-设备缓存=END--------------------------------------------------------------- + EquipmentCache getEquipmentCache(); } 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 new file mode 100644 index 00000000..b3f8f4ad --- /dev/null +++ b/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java @@ -0,0 +1,19 @@ +package com.das.modules.cache.service; + +import com.das.modules.cache.domain.DeviceInfoCache; + +import java.util.List; + +/** + * 设备缓存 + */ +public interface EquipmentCache { + /** + * 获取设备缓存列表 + * @return List + */ + public List getDevicesCache(); + public void refreshDeviceCache(Long deviceId); + DeviceInfoCache getDeviceInfoCache(String deviceCode); + DeviceInfoCache getDeviceInfoCache(Long deviceId); +} diff --git a/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java new file mode 100644 index 00000000..0b0b669f --- /dev/null +++ b/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java @@ -0,0 +1,18 @@ +package com.das.modules.cache.service.impl; + +import com.das.modules.cache.service.CacheService; +import com.das.modules.cache.service.EquipmentCache; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class CacheServiceImpl implements CacheService { + + @Autowired + EquipmentCache equipmentCache;; + + @Override + public EquipmentCache getEquipmentCache() { + return equipmentCache; + } +} 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 new file mode 100644 index 00000000..63947325 --- /dev/null +++ b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java @@ -0,0 +1,107 @@ +package com.das.modules.cache.service.impl; + +import com.das.modules.cache.domain.DeviceInfoCache; +import com.das.modules.cache.service.EquipmentCache; +import com.das.modules.equipment.entity.SysEquipment; +import com.das.modules.equipment.mapper.SysEquipmentMapper; +import jakarta.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + +@Service +public class EquipmentCacheImpl implements EquipmentCache { + @Autowired + SysEquipmentMapper sysEquipmentMapper; + + private final List deviceInfoCaches = Collections.synchronizedList(new ArrayList<>()); + + /** + * 设备CODE索引，用于通过设备CODE访问设备缓存信息 + */ + private final ConcurrentHashMap deviceCodeIndex = new ConcurrentHashMap<>(); + private final ConcurrentHashMap deviceIdIndex = new ConcurrentHashMap<>(); + + /** + * 初始化设备缓存 + */ + @PostConstruct + private void initDeviceInfoCaches() { + List equipments = sysEquipmentMapper.selectList(); + for (int i = 0; i < equipments.size(); i++) { + SysEquipment equipment = equipments.get(i); + 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); + //创建Code索引 + deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),i); + //创建Id索引 + deviceIdIndex.put(equipment.getId(),i); + + } + } + /** + * 释放设备缓存信息 + */ + private void freeDeviceInfoCaches() { + deviceInfoCaches.clear(); + deviceCodeIndex.clear(); + } + + + + @Override + public List getDevicesCache() { + return Collections.unmodifiableList(deviceInfoCaches); + } + + @Override + public void refreshDeviceCache(Long deviceId) { + SysEquipment equipment = sysEquipmentMapper.selectById(deviceId); + if (equipment != null) { + DeviceInfoCache deviceInfoCache = new DeviceInfoCache(); + deviceInfoCache.setDeviceId(equipment.getId()); + deviceInfoCache.setDeviceCode(equipment.getCode()); + deviceInfoCache.setDeviceName(equipment.getName()); + deviceInfoCache.setObjectType(equipment.getObjectType()); + deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); + //如果是已经缓存过的设备直接缓存 + Integer index = deviceIdIndex.get(deviceId); + if (index != null) { + deviceInfoCaches.set(index, deviceInfoCache); + } + else{ + deviceInfoCaches.add(deviceInfoCache); + index = deviceInfoCaches.size(); + deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),index); + deviceIdIndex.put(equipment.getId(),index); + } + } + } + + @Override + public DeviceInfoCache getDeviceInfoCache(String deviceCode) { + Integer index = deviceCodeIndex.get(deviceCode); + if (index != null) { + return deviceInfoCaches.get(index); + } + return null; + } + + @Override + public DeviceInfoCache getDeviceInfoCache(Long deviceId) { + Integer index = deviceIdIndex.get(deviceId); + if (index != null) { + return deviceInfoCaches.get(index); + } + return null; + } +} 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 4fa75677..75b69436 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.getDeviceInfoCache(code); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(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 71ce79e0..cd4fcb77 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.getDeviceInfoCache(code); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(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/calc/service/CalcJob.java b/das/src/main/java/com/das/modules/calc/service/CalcJob.java index 98426749..5512c560 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; @@ -32,7 +33,7 @@ public class CalcJob implements Job { if (expression == null) { throw new JobExecutionException("expression is null"); } - Map envs = expression.newEnv("G_DEVICES", cacheService.getDevicesCache()); + Map envs = expression.newEnv("G_DEVICES", cacheService.getEquipmentCache().getDevicesCache()); Object result = expression.execute(envs); sw.stop(); log.debug("任务[{}]已执行，结果:{}, 耗时:{}秒", calcModule.getName(), result, sw.getTotalTimeMillis()/1000.0); 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 8d9bb053..986fa82a 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 @@ -6,20 +6,15 @@ import com.das.modules.cache.domain.DeviceInfoCache; import com.das.modules.cache.service.CacheService; import com.das.modules.data.domain.DeviceEventInfo; import com.das.modules.data.service.impl.DataServiceImpl; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.IdUtil; import com.das.common.constant.MeasType; import com.das.common.utils.AdminRedisTemplate; -import com.das.modules.equipment.domain.vo.IotModelFieldVo; -import com.das.modules.equipment.entity.SysIotModelField; import com.das.modules.equipment.mapper.SysIotModelMapper; import com.das.modules.node.disruptor.MessageEventFactory; import com.das.modules.node.disruptor.TerminalMessageEventHandler; -import com.das.modules.node.domain.bo.CalculateRTData; import com.das.modules.node.domain.bo.RTData; import com.das.modules.node.domain.bo.TerminalMessage; import com.das.modules.node.domain.vo.*; @@ -28,8 +23,6 @@ import com.das.modules.node.mapper.SysCommunicationLinkMapper; import com.das.modules.node.mapper.SysImpTabMappingMapper; import com.das.modules.node.service.NodeMessageService; import com.das.modules.data.service.TDEngineService; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.dsl.Disruptor; @@ -42,10 +35,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import java.util.stream.Collectors; @Slf4j @Service @@ -308,7 +299,7 @@ public class NodeMessageServiceImpl implements NodeMessageService { }); log.info("消息data转化deviceVo,{}",list); for (DeviceEventVo item : list){ - DeviceInfoCache deviceInfoCache = cacheService.getDeviceInfoCache(Long.valueOf(item.getDeviceId())); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(Long.valueOf(item.getDeviceId())); DeviceEventInfo deviceEventInfo = new DeviceEventInfo(); deviceEventInfo.setUpdateTime(item.getEventTime()); deviceEventInfo.setEventId(IdWorker.getId());