diff --git a/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigService.java b/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigService.java index 760bf10..51007de 100644 --- a/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigService.java +++ b/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigService.java @@ -12,17 +12,6 @@ import com.viewsh.module.iot.dal.dataobject.integration.clean.CleanOrderIntegrat */ public interface CleanOrderIntegrationConfigService { - /** - * 根据设备ID查询配置(带缓存) - *
- * 优先从 Redis 缓存读取,缓存未命中时从数据库查询并写入缓存 - * 缓存 TTL: 5 分钟 - * - * @param deviceId 设备ID - * @return 集成配置,如果不存在或未启用返回 null - */ - CleanOrderIntegrationConfig getConfigByDeviceId(Long deviceId); - /** * 根据设备ID查询配置包装器(包含完整信息) *
diff --git a/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigServiceImpl.java b/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigServiceImpl.java
index 4ce922e..d9caf36 100644
--- a/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigServiceImpl.java
+++ b/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/integration/clean/CleanOrderIntegrationConfigServiceImpl.java
@@ -1,7 +1,6 @@
package com.viewsh.module.iot.service.integration.clean;
import com.viewsh.framework.common.util.json.JsonUtils;
-import com.viewsh.module.iot.dal.dataobject.integration.clean.CleanOrderIntegrationConfig;
import com.viewsh.module.iot.dal.dataobject.integration.clean.OpsAreaDeviceRelationDO;
import com.viewsh.module.iot.dal.mysql.integration.clean.OpsAreaDeviceRelationMapper;
import jakarta.annotation.Resource;
@@ -25,8 +24,6 @@ public class CleanOrderIntegrationConfigServiceImpl implements CleanOrderIntegra
/**
* 配置缓存 Key 模式
*/
- private static final String CONFIG_DEVICE_KEY_PATTERN = "iot:clean:config:device:%s";
- private static final String CONFIG_AREA_KEY_PATTERN = "iot:clean:config:area:%s";
private static final String CONFIG_WRAPPER_KEY_PATTERN = "iot:clean:config:wrapper:%s";
private static final String CONFIG_AREA_TYPE_KEY_PATTERN = "iot:clean:config:area:%s:type:%s";
@@ -48,49 +45,6 @@ public class CleanOrderIntegrationConfigServiceImpl implements CleanOrderIntegra
@Resource
private StringRedisTemplate stringRedisTemplate;
- @Override
- public CleanOrderIntegrationConfig getConfigByDeviceId(Long deviceId) {
- log.debug("[CleanOrderConfig] 查询设备配置:deviceId={}", deviceId);
-
- // 1. 尝试从 Redis 缓存读取
- String cacheKey = formatDeviceKey(deviceId);
- String cachedConfig = stringRedisTemplate.opsForValue().get(cacheKey);
-
- if (cachedConfig != null) {
- log.debug("[CleanOrderConfig] 命中缓存:deviceId={}", deviceId);
- return JsonUtils.parseObject(cachedConfig, CleanOrderIntegrationConfig.class);
- }
-
- // 2. 从数据库查询
- OpsAreaDeviceRelationDO relation = relationMapper.selectByDeviceId(deviceId);
-
- if (relation == null) {
- log.debug("[CleanOrderConfig] 设备无关联配置:deviceId={}", deviceId);
- return null;
- }
-
- if (!relation.getEnabled()) {
- log.debug("[CleanOrderConfig] 设备配置已禁用:deviceId={}", deviceId);
- return null;
- }
-
- CleanOrderIntegrationConfig config = relation.getConfigData();
-
- // 3. 写入缓存
- if (config != null) {
- stringRedisTemplate.opsForValue().set(
- cacheKey,
- JsonUtils.toJsonString(config),
- CONFIG_CACHE_TTL_SECONDS,
- TimeUnit.SECONDS
- );
- }
-
- log.debug("[CleanOrderConfig] 查询到配置:deviceId={}, areaId={}", deviceId, relation.getAreaId());
-
- return config;
- }
-
@Override
public List