Merge branch 'device-microservice'

# Conflicts: # src/main/java/com/ycwl/basic/integration/scenic/service/ScenicConfigIntegrationService.java # src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java
2025-09-04 12:28:32 +08:00
parent 657eb482bb bbfc61d75a
commit 8ad999f779
53 changed files with 3675 additions and 874 deletions
--- a/src/main/java/com/ycwl/basic/integration/scenic/dto/config/BatchUpdateResponse.java
+++ b/src/main/java/com/ycwl/basic/integration/scenic/dto/config/BatchUpdateResponse.java
@@ -13,4 +13,12 @@ public class BatchUpdateResponse {
    
    @JsonProperty("message")
    private String message;
+    
+    public Integer getSuccess() {
+        return (updatedCount != null ? updatedCount : 0) + (createdCount != null ? createdCount : 0);
+    }
+    
+    public Integer getFailed() {
+        return 0; // 当前响应格式不包含失败计数，返回0作为默认值
+    }
 }
--- a/src/main/java/com/ycwl/basic/integration/scenic/example/ScenicIntegrationExample.java
+++ b/src/main/java/com/ycwl/basic/integration/scenic/example/ScenicIntegrationExample.java
@@ -1,9 +1,9 @@
 package com.ycwl.basic.integration.scenic.example;

-import com.ycwl.basic.integration.scenic.dto.config.CreateConfigRequest;
-import com.ycwl.basic.integration.scenic.dto.filter.FilterCondition;
-import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterRequest;
-import com.ycwl.basic.integration.scenic.dto.scenic.CreateScenicRequest;
+import com.ycwl.basic.integration.common.service.IntegrationFallbackService;
+import com.ycwl.basic.integration.scenic.dto.config.*;
+import com.ycwl.basic.integration.scenic.dto.filter.*;
+import com.ycwl.basic.integration.scenic.dto.scenic.*;
 import com.ycwl.basic.integration.scenic.service.ScenicConfigIntegrationService;
 import com.ycwl.basic.integration.scenic.service.ScenicIntegrationService;
 import lombok.RequiredArgsConstructor;
@@ -11,10 +11,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;

 /**
- * ZT-Scenic集成服务使用示例
- * 仅供参考，实际使用时根据业务需要调用相应的服务方法
+ * 景区集成示例（包含降级机制）
+ * 演示景区集成和失败降级策略的使用
 */
@Slf4j
@Component
@@ -23,6 +25,9 @@ public class ScenicIntegrationExample {
    
    private final ScenicIntegrationService scenicIntegrationService;
    private final ScenicConfigIntegrationService scenicConfigIntegrationService;
+    private final IntegrationFallbackService fallbackService;
+    
+    private static final String SERVICE_NAME = "zt-scenic";
    
    /**
     * 示例：创建景区并设置配置
@@ -75,4 +80,105 @@ public class ScenicIntegrationExample {
            log.error("筛选景区失败", e);
        }
    }
+    
+    /**
+     * 演示基础景区操作的降级机制
+     */
+    public void basicScenicOperationsExample() {
+        log.info("=== 基础景区操作示例（含降级机制） ===");
+
+        Long scenicId = 2001L;
+
+        try {
+            // 获取景区信息 - 自动降级
+            ScenicV2DTO scenic = scenicIntegrationService.getScenic(scenicId);
+            log.info("获取景区成功: {}", scenic.getName());
+
+            // 获取景区配置信息 - 自动降级
+            ScenicV2WithConfigDTO scenicWithConfig = scenicIntegrationService.getScenicWithConfig(scenicId);
+            log.info("获取景区配置成功，配置数量: {}", scenicWithConfig.getConfig().size());
+
+            // 获取扁平化配置 - 自动降级
+            Map<String, Object> flatConfig = scenicIntegrationService.getScenicFlatConfig(scenicId);
+            log.info("获取扁平化配置成功，配置项数量: {}", flatConfig.size());
+
+        } catch (Exception e) {
+            log.error("景区操作降级失败", e);
+        }
+    }
+
+    /**
+     * 演示景区配置管理的降级机制
+     */
+    public void scenicConfigManagementFallbackExample() {
+        log.info("=== 景区配置管理示例（含降级机制） ===");
+
+        Long scenicId = 2001L;
+
+        try {
+            // 获取扁平化配置 - 自动降级
+            Map<String, Object> flatConfigs = scenicConfigIntegrationService.getFlatConfigs(scenicId);
+            log.info("获取扁平化配置成功，配置项数量: {}", flatConfigs.size());
+
+            // 批量更新配置 - 直接操作，失败时抛出异常
+            Map<String, Object> updates = new HashMap<>();
+            updates.put("max_visitors", "5000");
+            updates.put("opening_hours", "08:00-18:00");
+            
+            BatchUpdateResponse result = scenicConfigIntegrationService.batchFlatUpdateConfigs(scenicId, updates);
+            log.info("批量更新配置完成: 成功 {}, 失败 {}", result.getSuccess(), result.getFailed());
+
+        } catch (Exception e) {
+            log.error("景区配置管理操作失败", e);
+        }
+    }
+
+    /**
+     * 演示降级缓存管理
+     */
+    public void fallbackCacheManagementExample() {
+        log.info("=== 景区降级缓存管理示例 ===");
+
+        String scenicCacheKey = "scenic:2001";
+        String configCacheKey = "scenic:flat:configs:2001";
+
+        // 检查降级缓存状态
+        boolean hasScenicCache = fallbackService.hasFallbackCache(SERVICE_NAME, scenicCacheKey);
+        boolean hasConfigCache = fallbackService.hasFallbackCache(SERVICE_NAME, configCacheKey);
+
+        log.info("景区降级缓存存在: {}", hasScenicCache);
+        log.info("配置降级缓存存在: {}", hasConfigCache);
+
+        // 获取降级缓存统计信息
+        IntegrationFallbackService.FallbackCacheStats stats = fallbackService.getFallbackCacheStats(SERVICE_NAME);
+        log.info("景区服务降级缓存统计: 缓存数量={}, TTL={}天", 
+                stats.getTotalCacheCount(), stats.getFallbackTtlDays());
+
+        // 清理特定的降级缓存
+        if (hasScenicCache) {
+            fallbackService.clearFallbackCache(SERVICE_NAME, scenicCacheKey);
+            log.info("已清理景区降级缓存");
+        }
+        
+        // 如果缓存过多，批量清理
+        if (stats.getTotalCacheCount() > 50) {
+            fallbackService.clearAllFallbackCache(SERVICE_NAME);
+            log.info("已批量清理所有景区降级缓存");
+        }
+    }
+
+    /**
+     * 运行所有示例
+     */
+    public void runAllExamples() {
+        log.info("开始运行景区集成示例（包含降级机制）...");
+
+        createScenicWithConfig();
+        filterScenics();
+        basicScenicOperationsExample();
+        scenicConfigManagementFallbackExample();
+        fallbackCacheManagementExample();
+
+        log.info("景区集成示例运行完成");
+    }
 }
--- a/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicConfigIntegrationService.java
+++ b/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicConfigIntegrationService.java
@@ -2,6 +2,7 @@ package com.ycwl.basic.integration.scenic.service;

 import com.ycwl.basic.integration.common.exception.IntegrationException;
 import com.ycwl.basic.integration.common.response.CommonResponse;
+import com.ycwl.basic.integration.common.service.IntegrationFallbackService;
 import com.ycwl.basic.integration.scenic.client.ScenicConfigV2Client;
 import com.ycwl.basic.integration.scenic.dto.config.*;
 import lombok.RequiredArgsConstructor;
@@ -17,43 +18,61 @@ import java.util.Map;
 public class ScenicConfigIntegrationService {

    private final ScenicConfigV2Client scenicConfigV2Client;
+    private final IntegrationFallbackService fallbackService;
+    
+    private static final String SERVICE_NAME = "zt-scenic";

    public List<ScenicConfigV2DTO> listConfigs(Long scenicId) {
+        log.info("获取景区配置列表, scenicId: {}", scenicId);
        CommonResponse<List<ScenicConfigV2DTO>> response = scenicConfigV2Client.listConfigs(scenicId);
        return handleResponse(response, "获取景区配置列表失败");
    }

    public ScenicConfigV2DTO getConfigByKey(Long scenicId, String configKey) {
+        log.info("根据键获取景区配置, scenicId: {}, configKey: {}", scenicId, configKey);
        CommonResponse<ScenicConfigV2DTO> response = scenicConfigV2Client.getConfigByKey(scenicId, configKey);
        return handleResponse(response, "根据键获取景区配置失败");
    }

    public Map<String, Object> getFlatConfigs(Long scenicId) {
-        CommonResponse<Map<String, Object>> response = scenicConfigV2Client.getFlatConfigs(scenicId);
-        return handleResponse(response, "获取景区扁平化配置失败");
+        log.info("获取景区扁平化配置, scenicId: {}", scenicId);
+        return fallbackService.executeWithFallback(
+            SERVICE_NAME,
+            "scenic:flat:configs:" + scenicId,
+            () -> {
+                CommonResponse<Map<String, Object>> response = scenicConfigV2Client.getFlatConfigs(scenicId);
+                return handleResponse(response, "获取景区扁平化配置失败");
+            },
+            Map.class
+        );
    }

    public ScenicConfigV2DTO createConfig(Long scenicId, CreateConfigRequest request) {
+        log.info("创建景区配置, scenicId: {}, configKey: {}", scenicId, request.getConfigKey());
        CommonResponse<ScenicConfigV2DTO> response = scenicConfigV2Client.createConfig(scenicId, request);
        return handleResponse(response, "创建景区配置失败");
    }

    public ScenicConfigV2DTO updateConfig(Long scenicId, String id, UpdateConfigRequest request) {
+        log.info("更新景区配置, scenicId: {}, id: {}", scenicId, id);
        CommonResponse<ScenicConfigV2DTO> response = scenicConfigV2Client.updateConfig(scenicId, id, request);
        return handleResponse(response, "更新景区配置失败");
    }

    public void deleteConfig(Long scenicId, String id) {
+        log.info("删除景区配置, scenicId: {}, id: {}", scenicId, id);
        CommonResponse<Void> response = scenicConfigV2Client.deleteConfig(scenicId, id);
        handleResponse(response, "删除景区配置失败");
    }

    public BatchUpdateResponse batchUpdateConfigs(Long scenicId, BatchConfigRequest request) {
+        log.info("批量更新景区配置, scenicId: {}, configs count: {}", scenicId, request.getConfigs().size());
        CommonResponse<BatchUpdateResponse> response = scenicConfigV2Client.batchUpdateConfigs(scenicId, request);
        return handleResponse(response, "批量更新景区配置失败");
    }

    public BatchUpdateResponse batchFlatUpdateConfigs(Long scenicId, Map<String, Object> configs) {
+        log.info("扁平化批量更新景区配置, scenicId: {}, configs count: {}", scenicId, configs.size());
        CommonResponse<BatchUpdateResponse> response = scenicConfigV2Client.batchFlatUpdateConfigs(scenicId, configs);
        return handleResponse(response, "扁平化批量更新景区配置失败");
    }
--- a/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java
+++ b/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java
@@ -2,6 +2,7 @@ package com.ycwl.basic.integration.scenic.service;

 import com.ycwl.basic.integration.common.exception.IntegrationException;
 import com.ycwl.basic.integration.common.response.CommonResponse;
+import com.ycwl.basic.integration.common.service.IntegrationFallbackService;
 import com.ycwl.basic.integration.scenic.client.ScenicConfigV2Client;
 import com.ycwl.basic.integration.scenic.client.ScenicV2Client;
 import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterPageResponse;
@@ -25,48 +26,81 @@ public class ScenicIntegrationService {

    private final ScenicV2Client scenicV2Client;
    private final ScenicConfigV2Client scenicConfigV2Client;
+    private final IntegrationFallbackService fallbackService;
+    
+    private static final String SERVICE_NAME = "zt-scenic";

    public ScenicV2DTO getScenic(Long scenicId) {
-        CommonResponse<ScenicV2DTO> response = scenicV2Client.getScenic(scenicId);
-        return handleResponse(response, "获取景区信息失败");
+        log.info("获取景区信息, scenicId: {}", scenicId);
+        return fallbackService.executeWithFallback(
+            SERVICE_NAME,
+            "scenic:" + scenicId,
+            () -> {
+                CommonResponse<ScenicV2DTO> response = scenicV2Client.getScenic(scenicId);
+                return handleResponse(response, "获取景区信息失败");
+            },
+            ScenicV2DTO.class
+        );
    }

    public ScenicV2WithConfigDTO getScenicWithConfig(Long scenicId) {
-        CommonResponse<ScenicV2WithConfigDTO> response = scenicV2Client.getScenicWithConfig(scenicId);
-        return handleResponse(response, "获取景区配置信息失败");
+        log.info("获取景区配置信息, scenicId: {}", scenicId);
+        return fallbackService.executeWithFallback(
+            SERVICE_NAME,
+            "scenic:config:" + scenicId,
+            () -> {
+                CommonResponse<ScenicV2WithConfigDTO> response = scenicV2Client.getScenicWithConfig(scenicId);
+                return handleResponse(response, "获取景区配置信息失败");
+            },
+            ScenicV2WithConfigDTO.class
+        );
    }

    public Map<String, Object> getScenicFlatConfig(Long scenicId) {
-        CommonResponse<Map<String, Object>> response = scenicConfigV2Client.getFlatConfigs(scenicId);
-        return handleResponse(response, "获取景区扁平化配置失败");
+        log.info("获取景区扁平化配置, scenicId: {}", scenicId);
+        return fallbackService.executeWithFallback(
+            SERVICE_NAME,
+            "scenic:flat:config:" + scenicId,
+            () -> {
+                CommonResponse<Map<String, Object>> response = scenicConfigV2Client.getFlatConfigs(scenicId);
+                return handleResponse(response, "获取景区扁平化配置失败");
+            },
+            Map.class
+        );
    }

    public ScenicV2DTO createScenic(CreateScenicRequest request) {
+        log.info("创建景区, name: {}", request.getName());
        CommonResponse<ScenicV2DTO> response = scenicV2Client.createScenic(request);
        return handleResponse(response, "创建景区失败");
    }

    public ScenicV2DTO updateScenic(Long scenicId, UpdateScenicRequest request) {
+        log.info("更新景区信息, scenicId: {}", scenicId);
        CommonResponse<ScenicV2DTO> response = scenicV2Client.updateScenic(scenicId, request);
        return handleResponse(response, "更新景区信息失败");
    }

    public void deleteScenic(Long scenicId) {
+        log.info("删除景区, scenicId: {}", scenicId);
        CommonResponse<Void> response = scenicV2Client.deleteScenic(scenicId);
        handleResponse(response, "删除景区失败");
    }

    public ScenicFilterPageResponse filterScenics(ScenicFilterRequest request) {
+        log.info("筛选景区, filters: {}", request.getFilters().size());
        CommonResponse<ScenicFilterPageResponse> response = scenicV2Client.filterScenics(request);
        return handleResponse(response, "筛选景区失败");
    }

    public ScenicV2ListResponse listScenics(Integer page, Integer pageSize, Integer status, String name) {
+        log.info("分页查询景区列表, page: {}, pageSize: {}, status: {}, name: {}", page, pageSize, status, name);
        CommonResponse<ScenicV2ListResponse> response = scenicV2Client.listScenics(page, pageSize, status, name);
        return handleResponse(response, "分页查询景区列表失败");
    }

    public ScenicV2WithConfigListResponse listScenicsWithConfig(Integer page, Integer pageSize, Integer status, String name) {
+        log.info("分页查询景区带配置列表, page: {}, pageSize: {}, status: {}, name: {}", page, pageSize, status, name);
        CommonResponse<ScenicV2WithConfigListResponse> response = scenicV2Client.listScenicsWithConfig(page, pageSize, status, name);
        return handleResponse(response, "分页查询景区带配置列表失败");
    }